diff --git a/mpcommon.c b/mpcommon.c
index 95c21ead65..e3e6c4ac81 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -18,4 +18,4 @@
 
 #include "version.h"
 
-const char *mplayer_version  = "mplayer2 " VERSION;
+const char *mplayer_version  = "mplayer " VERSION;
diff --git a/mplayer.c b/mplayer.c
index 33a09f7a3b..edf7d85be8 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -3818,8 +3818,7 @@ static int select_audio(demuxer_t *demuxer, int audio_id, char **audio_lang)
 
 static void print_version(void)
 {
-    mp_msg(MSGT_CPLAYER, MSGL_INFO,
-           "%s (C) 2000-2012 MPlayer & mplayer2 teams\n", mplayer_version);
+    mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s (C) 2000-2012\n", mplayer_version);
 
     /* Test for CPU capabilities (and corresponding OS support) for optimizing */
     GetCpuCaps(&gCpuCaps);
diff --git a/version.sh b/version.sh
index 73905f05fc..3b0c319c83 100755
--- a/version.sh
+++ b/version.sh
@@ -5,13 +5,13 @@ test "$1" && extra="-$1"
 # Extract revision number from file used by daily tarball snapshots
 # or from "git describe" output
 git_revision=$(cat snapshot_version 2> /dev/null)
-test $git_revision || test ! -d .git || git_revision=`git describe --match "v[0-9]*" --always`
+test $git_revision || test ! -d .git || git_revision=`git rev-parse --short HEAD`
 git_revision=$(expr "$git_revision" : v*'\(.*\)')
 test $git_revision || git_revision=UNKNOWN
 
 # releases extract the version number from the VERSION file
 version=$(cat VERSION 2> /dev/null)
-test $version || version=$git_revision
+test $version || version=git-$git_revision
 
 NEW_REVISION="#define VERSION \"${version}${extra}\""
 OLD_REVISION=$(head -n 1 version.h 2> /dev/null)