diff --git a/autogen.sh b/autogen.sh
index e29c9a0..60cad22 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,20 +4,22 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME=mate-terminal
+PKG_NAME="mate-terminal"
 
-(test -f $srcdir/configure.ac \
-  && test -f $srcdir/autogen.sh \
-  && test -d $srcdir/src \
-  && test -f $srcdir/src/terminal.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" USE_COMMON_DOC_BUILD=yes . mate-autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9
+MATE_DATADIR="$mate_datadir"
+USE_COMMON_DOC_BUILD=yes
+
+. mate-autogen.sh
+
diff --git a/mate-terminal.desktop.in.in b/mate-terminal.desktop.in.in
index c82e540..ae6a36c 100644
--- a/mate-terminal.desktop.in.in
+++ b/mate-terminal.desktop.in.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=MATE Terminal
+_Name=Terminal
 _Comment=Use the command line
 TryExec=mate-terminal
 Exec=mate-terminal
@@ -11,4 +11,6 @@ X-MATE-Bugzilla-Product=mate-terminal
 X-MATE-Bugzilla-Component=BugBuddyBugs
 X-MATE-Bugzilla-Version=@VERSION@
 Categories=MATE;GTK;Utility;TerminalEmulator;
+OnlyShowIn=MATE;
 StartupNotify=true
+