diff --git a/autogen.sh b/autogen.sh
index 7f8378bf1f..1fa45de42f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,12 +6,14 @@ package=gstreamer
 srcfile=gst/gst.c
 
 # a quick cvs co to ease the transition
-if test ! -d common; then
-  if test -f CVS/Tag; then
-    # get everything from CVS/Tag from second character on
+if test ! -d common;
+then
+  echo "+ getting common/ from cvs"
+  if test -e CVS/Tag
+  then
     TAG="-r `tail -c +2 CVS/Tag`"
   fi
-  echo "+ getting common from cvs"; cvs co $TAG common
+  cvs co $TAG common
 fi
 
 # source helper functions