diff --git a/DoKernelOrg b/DoKernelOrg
index c8fc02052c..93426523da 100755
--- a/DoKernelOrg
+++ b/DoKernelOrg
@@ -14,47 +14,26 @@ make clean >/dev/null 2>&1 &&
 case "$1" in
 '')
 	echo "* Building all"
-	branches='naster master maint'
-
-	# Make sure naster is between master and pu if exists
-	if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
-	then
-		master=`git rev-parse --verify refs/heads/master` &&
-		pu=`git rev-parse --verify refs/heads/pu` &&
-		MBM=`git merge-base --all $naster $master` &&
-		MBN=`git merge-base --all $naster $pu` &&
-		case ",$MBM,$MBN," in
-		",$master,$naster,") ;;
-		*)	echo >&2 "naster is not between master and pu"
-			exit 1 ;;
-		esac
-		# If naster is the same as pu, no point rebuilding pu.
-		case ",$naster,$pu," in
-		",$pu,$naster,") ;;
-		*) branches="$branches pu" ;;
-		esac
-	fi
-
-	{
-		nstalled=install
-		for branch in $branches
-		do
-			if git-rev-parse --verify refs/heads/$branch 2>/dev/null
-			then
-				echo "** $branch **" &&
-				git checkout $branch &&
-				make $J $nstalled &&
-				make test &&
-				make clean &&
-				nstalled=all || exit $?
-			else
-				echo
-				echo "* NO $branch"
-				echo
-			fi
-		done
-	} >:all.log 2>&1
+	branches='next master maint'
+	nstalled=install
+	for branch in $branches
+	do
+		if git-rev-parse --verify refs/heads/$branch 2>/dev/null
+		then
+			echo "** $branch **" &&
+			git checkout $branch &&
+			make $J $nstalled &&
+			make test &&
+			make clean &&
+			nstalled=all || exit $?
+		else
+			echo
+			echo "* NO $branch"
+			echo
+		fi
+	done >:all.log 2>&1
 	;;
+
 maint | master)
 	arch=x86_64
 	mkdir -p $G/RPMS/$arch $G/RPMS/SRPMS &&
diff --git a/Doit b/Doit
index 705e8c4b0c..a9f91a6e9c 100755
--- a/Doit
+++ b/Doit
@@ -8,26 +8,7 @@ test -z "$(git diff --cached --name-status)" || {
 }
 Meta/Make clean >/dev/null 2>&1
 
-branches='naster master maint'
-
-# Make sure naster is between master and pu if exists
-if naster=`git rev-parse --verify refs/heads/naster 2>/dev/null`
-then
-	master=`git rev-parse --verify refs/heads/master` &&
-	pu=`git rev-parse --verify refs/heads/pu` &&
-	MBM=`git merge-base --all $naster $master` &&
-	MBN=`git merge-base --all $naster $pu` &&
-	case ",$MBM,$MBN," in
-	",$master,$naster,") ;;
-	*)	echo >&2 "naster is not between master and pu"
-		exit 1 ;;
-	esac
-	# If naster is the same as pu, no point rebuilding pu.
-	case ",$naster,$pu," in
-	",$pu,$naster,") ;;
-	*) branches="$branches pu" ;;
-	esac
-fi
+branches='next master maint'
 
 nstall=install
 for branch in $branches
@@ -46,4 +27,6 @@ do
 	fi
 done >./:all.log 2>&1
 
+git checkout master
+