diff --git a/boards/cubietruck.sh b/boards/cubietruck.sh
index 6cad45e..eb3ee1f 100644
--- a/boards/cubietruck.sh
+++ b/boards/cubietruck.sh
@@ -73,9 +73,9 @@ build_kernel_armhf() {
 	notice "building $arch kernel"
 	mkdir -p $R/tmp/kernels/$device_name
 
-	clone-git $sunxi_boards master $R/tmp/kernels/$device_name/sunxi-boards
-	clone-git $sunxi_tools master $R/tmp/kernels/$device_name/sunxi-tools
-	clone-git $sunxi_uboot master $R/tmp/kernels/$device_name/sunxi-uboot
+	clone-git $sunxi_boards master "$R/tmp/kernels/$device_name/sunxi-boards"
+	clone-git $sunxi_tools master "$R/tmp/kernels/$device_name/sunxi-tools"
+	clone-git $sunxi_uboot "mirror/next" "$R/tmp/kernels/$device_name/sunxi-uboot"
 
 	pushd $R/tmp/kernels/$device_name/sunxi-tools
 	act "running fex2bin"
diff --git a/lib/helpers b/lib/helpers
index 8050d01..eef2674 100644
--- a/lib/helpers
+++ b/lib/helpers
@@ -61,9 +61,9 @@ get-kernel-firmware() {
 
 clone-git() {
 	fn clone-git "$@"
-	req=(giturl gitbranch clonepath)
+	req=(giturl gitbr clonepath)
 	local giturl="$1"
-	local gitbranch="$2"
+	local gitbr="$2"
 	local clonepath="$3"
 	ckreq || return 1
 
@@ -76,7 +76,7 @@ clone-git() {
 	else
 		git clone --depth 1 \
 			$giturl \
-			-b $gitbranch \
+			-b $gitbr \
 			$clonepath
 	fi
 }