diff --git a/boards/cubietruck.sh b/boards/cubietruck.sh
index eb3ee1f..055c61d 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 "mirror/next" "$R/tmp/kernels/$device_name/sunxi-uboot"
+	clone-git $sunxi_boards "$R/tmp/kernels/$device_name/sunxi-boards" master
+	clone-git $sunxi_tools  "$R/tmp/kernels/$device_name/sunxi-tools" master
+	clone-git $sunxi_uboot  "$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 eef2674..d4410b9 100644
--- a/lib/helpers
+++ b/lib/helpers
@@ -61,10 +61,10 @@ get-kernel-firmware() {
 
 clone-git() {
 	fn clone-git "$@"
-	req=(giturl gitbr clonepath)
+	req=(giturl clonepath)
 	local giturl="$1"
-	local gitbr="$2"
-	local clonepath="$3"
+	local clonepath="$2"
+	local gitbr="$3"
 	ckreq || return 1
 
 	notice "grabbing $(basename $clonepath)"
@@ -74,9 +74,10 @@ clone-git() {
 		git pull
 		popd
 	else
+		[[ -n $gitbr ]] && gitbr="-b $gitbr"
 		git clone --depth 1 \
 			$giturl \
-			-b $gitbr \
+			$gitbr \
 			$clonepath
 	fi
 }