diff --git a/makeclientrpm b/makeclientrpm
index 928568fca..f9e732f35 100755
--- a/makeclientrpm
+++ b/makeclientrpm
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 OSNAME=$(uname)
+VER=2.1
 
 if [ "$OSNAME" = "AIX" ]
 then
 
  	echo '.svn' > /tmp/xcat-excludes
-    tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/xCAT-client-2.0.tar xCAT-client-2.0
-    gzip -f /opt/freeware/src/packages/SOURCES/xCAT-client-2.0.tar
-    cd ./xCAT-client-2.0
-    rm -f /opt/freeware/src/packages/SRPMS/xCAT-client-2.0*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-client-2.0*rpm
+    tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/xCAT-client-$VER.tar xCAT-client
+    gzip -f /opt/freeware/src/packages/SOURCES/xCAT-client-$VER.tar
+    cd ./xCAT-client
+    rm -f /opt/freeware/src/packages/SRPMS/xCAT-client-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-client-$VER*rpm
     rpm -ba xCAT-client.spec
-    #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-client-2.0*rpm
+    #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-client-$VER*rpm
 
 else
 
@@ -22,8 +23,8 @@ else
    		pkg="packages"
 	fi
 
-	tar  --exclude .svn -czf /usr/src/$pkg/SOURCES/xCAT-client-2.0.tar.gz xCAT-client-2.0;
-	rm -f /usr/src/$pkg/SRPMS/xCAT-client-2.0*rpm /usr/src/$pkg/RPMS/noarch/xCAT-client-2.0*rpm
-	rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-client-2.0.tar.gz ;
-	#rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-client-2.0*rpm
+	tar  --exclude .svn -czf /usr/src/$pkg/SOURCES/xCAT-client-$VER.tar.gz xCAT-client;
+	rm -f /usr/src/$pkg/SRPMS/xCAT-client-$VER*rpm /usr/src/$pkg/RPMS/noarch/xCAT-client-$VER*rpm
+	rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-client-$VER.tar.gz ;
+	#rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-client-$VER*rpm
 fi
diff --git a/makeperlxcatrpm b/makeperlxcatrpm
index ed856f8ef..d45b3f9f2 100755
--- a/makeperlxcatrpm
+++ b/makeperlxcatrpm
@@ -1,18 +1,17 @@
 #!/bin/sh
 
 OSNAME=$(uname)
+VER="2.1"
 
 if [ "$OSNAME" = "AIX" ]
 then
 
 	echo '.svn' > /tmp/xcat-excludes
-	tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/perl-xCAT-2.0.tar perl-xCAT-2.0
-	gzip -f /opt/freeware/src/packages/SOURCES/perl-xCAT-2.0.tar
-	cd ./perl-xCAT-2.0
-	rm -f /opt/freeware/src/packages/SRPMS/perl-xCAT-2.0*rpm /opt/freeware/src/packages/RPMS/ppc/perl-xCAT-2.0*rpm
+	tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/perl-xCAT-$VER.tar perl-xCAT
+	gzip -f /opt/freeware/src/packages/SOURCES/perl-xCAT-$VER.tar
+	cd ./perl-xCAT
+	rm -f /opt/freeware/src/packages/SRPMS/perl-xCAT-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/perl-xCAT-$VER*rpm
 	rpm -ba perl-xCAT.spec
-	#rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/perl-xCAT-2.0*rpm
-
 else
 	if [ -f /etc/redhat-release ]
 	then
@@ -21,8 +20,7 @@ else
    		pkg="packages"
 	fi
 
-	tar --exclude .svn -czf /usr/src/$pkg/SOURCES/perl-xCAT-2.0.tar.gz perl-xCAT-2.0/;
-	rm -f /usr/src/$pkg/SRPMS/perl-xCAT-2.0*rpm /usr/src/$pkg/RPMS/noarch/perl-xCAT-2.0*rpm
-	rpmbuild -ta /usr/src/$pkg/SOURCES/perl-xCAT-2.0.tar.gz ;
-	#rpm -Uvh /usr/src/$pkg/RPMS/noarch/perl-xCAT-2.0*rpm
+	tar --exclude .svn -czf /usr/src/$pkg/SOURCES/perl-xCAT-$VER.tar.gz perl-xCAT/;
+	rm -f /usr/src/$pkg/SRPMS/perl-xCAT-$VER*rpm /usr/src/$pkg/RPMS/noarch/perl-xCAT-$VER*rpm
+	rpmbuild -ta /usr/src/$pkg/SOURCES/perl-xCAT-$VER.tar.gz ;
 fi
diff --git a/makeserverrpm b/makeserverrpm
index bcb23aa2b..12c9bbab0 100755
--- a/makeserverrpm
+++ b/makeserverrpm
@@ -1,17 +1,18 @@
 #!/bin/sh
 
 OSNAME=$(uname)
+VER=2.1
 
 if [ "$OSNAME" = "AIX" ]
 then
 
 	echo '.svn' > /tmp/xcat-excludes
-    tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/xCAT-server-2.0.tar xCAT-server-2.0
-    gzip -f /opt/freeware/src/packages/SOURCES/xCAT-server-2.0.tar
-    cd ./xCAT-server-2.0
-    rm -f /opt/freeware/src/packages/SRPMS/xCAT-server-2.0*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-server-2.0*rpm
+    tar -X /tmp/xcat-excludes -cf /opt/freeware/src/packages/SOURCES/xCAT-server-$VER.tar xCAT-server
+    gzip -f /opt/freeware/src/packages/SOURCES/xCAT-server-$VER.tar
+    cd ./xCAT-server
+    rm -f /opt/freeware/src/packages/SRPMS/xCAT-server-$VER*rpm /opt/freeware/src/packages/RPMS/ppc/xCAT-server-$VER*rpm
     rpm -ba xCAT-server.spec
-    #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-server-2.0*rpm
+    #rpm -Uvh /opt/freeware/src/packages/RPMS/ppc/xCAT-server-$VER*rpm
 
 else
 
@@ -22,8 +23,8 @@ else
    		pkg="packages"
 	fi
 
-	tar  --exclude .svn -czf /usr/src/$pkg/SOURCES/xCAT-server-2.0.tar.gz xCAT-server-2.0;
-	rm -f /usr/src/$pkg/SRPMS/xCAT-server-2.0*rpm /usr/src/$pkg/RPMS/noarch/xCAT-server-2.0*rpm
-	rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-server-2.0.tar.gz ;
-	#rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-server-2.0*rpm
+	tar  --exclude .svn -czf /usr/src/$pkg/SOURCES/xCAT-server-$VER.tar.gz xCAT-server;
+	rm -f /usr/src/$pkg/SRPMS/xCAT-server-$VER*rpm /usr/src/$pkg/RPMS/noarch/xCAT-server-$VER*rpm
+	rpmbuild -ta /usr/src/$pkg/SOURCES/xCAT-server-$VER.tar.gz ;
+	#rpm -Uvh /usr/src/$pkg/RPMS/noarch/xCAT-server-$VER*rpm
 fi