diff --git a/build/buildcvs b/build/buildcvs
index 8569450f1290de213e329dfa6889eea1033e0d49..d8e9642409a704912c31d3f7599415f1deb96fe1 100644
--- a/build/buildcvs
+++ b/build/buildcvs
@@ -58,11 +58,6 @@ case "$lustretag" in
         ldiskfstag="b1_8_iam"
         ;;
 
-    b_new_cmd)
-	portalstag="b_new_portals"
-        # lnettag="b_lnet_tmp"
-        ;;
-
     b_cmd*)
         portalstag="$lustretag"
         ;;
@@ -77,6 +72,17 @@ case "$lustretag" in
         portalstag="b_ioprovement"
         ;;
 
+    b_mpilnd)
+        # lnet mpilnd development branch
+	lnettag="b_mpilnd"
+	lustretag="HEAD"
+	;;
+
+    b_new_cmd)
+	portalstag="b_new_portals"
+        # lnettag="b_lnet_tmp"
+        ;;
+
     b_newconfig_rdmarouting)
         portalstag="b_hd_newconfig"
         lnettag="b_newconfig_rdmarouting"
@@ -101,32 +107,14 @@ case "$lustretag" in
         portalstag="b_port_test"
         ;;
 
-    b_ptl_smallfix)
-        portalstag="b_ptl_smallfix"
-        lustretag="b1_4"
-        ;;
-
     b_ptlrpc_cleanup)
         portalstag="b_ptlrpc_cleanup"
         ;;
 
-    b_self_test)
-        # lnet self test development branch
-	lnettag="b_self_test"
-	lustretag="HEAD"
-	;;
-
-    b_mpilnd)
-        # lnet mpilnd development branch
-	lnettag="b_mpilnd"
-	lustretag="HEAD"
-	;;
-
-    b_usocklnd)
-        # lnet usocklnd development branch
-	lnettag="b_usocklnd"
-	lustretag="b1_6_usocklnd"
-	;;
+    b_ptl_smallfix)
+        portalstag="b_ptl_smallfix"
+        lustretag="b1_4"
+        ;;
 
     # before 1_4_6, we didn't have lnet or snmp
     b_release_1_2_*|b_release_1_4_[0-5])
@@ -136,13 +124,6 @@ case "$lustretag" in
         snmptag=""
         ;;
 
-    b_release_1_4_6-patchless)
-        portalstag=b_release_1_4_6
-        lnettag=b_release_1_4_6-patchless
-        libsysiotag=b_release_1_4_6
-        snmptag=b_release_1_4_6
-        ;;
-
     b_release_1_4_6)
         portalstag="$lustretag"
         lnettag="$lustretag"
@@ -150,6 +131,13 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    b_release_1_4_6-patchless)
+        portalstag=b_release_1_4_6
+        lnettag=b_release_1_4_6-patchless
+        libsysiotag=b_release_1_4_6
+        snmptag=b_release_1_4_6
+        ;;
+
     # all later b_release_* tags
     b_release_*)
         lnettag="$lustretag"
@@ -157,11 +145,23 @@ case "$lustretag" in
         snmptag="$lustretag"
         ;;
 
+    b_self_test)
+        # lnet self test development branch
+	lnettag="b_self_test"
+	lustretag="HEAD"
+	;;
+
     # uOSS
     b_uoss)
         lnettag="b_uoss"
         ;;
     
+    b_usocklnd)
+        # lnet usocklnd development branch
+	lnettag="b_usocklnd"
+	lustretag="b1_6_usocklnd"
+	;;
+
     # CMD3
     HEAD|b_post_cmd3|b1_8_gssfix|b_new_cmd_sles10)
         # Update b1_8 above when changing this.