diff --git a/autogen.sh b/autogen.sh
index 0e5cb773ab00c80256db541ec4bbb6ea0181e38e..b0e41df9657b428140fa3d4d133ac88f654a4340 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,20 +4,21 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME=mate-screensaver
+PKG_NAME="mate-screensaver"
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/autogen.sh \
-  && test -d $srcdir/src \
-  && test -f $srcdir/src/mate-screensaver.c) || {
+(test -f $srcdir/configure.ac) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
 }
 
 which mate-autogen.sh || {
-    echo "You need to install mate-common from the MATE CVS"
+    echo "You need to install mate-common from the MATE Git"
     exit 1
 }
 
-REQUIRED_AUTOMAKE_VERSION=1.9 MATE_DATADIR="$mate_datadir" . mate-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9
+MATE_DATADIR="$mate_datadir"
+
+. mate-autogen.sh
+