diff --git a/.hgignore b/.hgignore
index bcc1cff5..7d3731af 100644
--- a/.hgignore
+++ b/.hgignore
@@ -15,6 +15,7 @@ Makefile.in
 .moo.mprj.session
 a.out
 aclocal.m4
+revision.m4
 compile
 config.guess
 config.h.in
diff --git a/Makefile.ug b/Makefile.ug
index 2469d706..08e2ea72 100644
--- a/Makefile.ug
+++ b/Makefile.ug
@@ -6,7 +6,8 @@ EXTRA_DIST +=			\
 	COPYING.GPL		\
 	COPYING			\
 	LICENSE			\
-	THANKS
+	THANKS			\
+	gen-revision-m4
 
 @MOO_PO_SUBDIRS_RULE@
 @MOO_PO_SUBDIRS_RULE2@
@@ -59,14 +60,6 @@ DISTCLEANFILES +=		\
 # DISTCHECK_CONFIGURE_FLAGS = --enable-unit-tests
 distuninstallcheck_listfiles = find . -type f -print | grep -v share/mime/ | grep -v share/icons/hicolor
 
-snapshot:
-	if [ -d $(top_srcdir)/.hg ]; then \
-	  suffix=r`hg tip --template '{rev}'`; \
-	else \
-	  suffix=`date +%F-%H-%M`; \
-	fi; \
-	$(MAKE) dist && mv $(PACKAGE)-$(VERSION).tar.bz2 $(PACKAGE)-"$$suffix".tar.bz2
-
 win-test-stuff:
 	$(MAKE) all
 	mkdir -p test-stuff/test-data
diff --git a/autogen.sh b/autogen.sh
index a2487e98..a4f87ef8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,6 +26,11 @@ AUTOCONF=${AUTOCONF:-autoconf}
 LIBTOOLIZE=${LIBTOOLIZE:-libtoolize}
 UGLY=${UGLY:-./ugly/ugly}
 
+if [ -x gen-revision-m4 ]; then
+  echo ./gen-revision-m4
+  ./gen-revision-m4 || exit $?
+fi
+
 if [ -f Makefile.ug ]; then
   echo $UGLY
   $UGLY || exit $?
diff --git a/configure.ac b/configure.ac
index e0547652..8391d3d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,12 +3,16 @@
 #
 
 # keep version in sync with doc/medit.t2t
-AC_INIT([medit],[0.9.5],[muntyan@tamu.edu],[medit])
+m4_define([moo_version], [0.9.5])
+m4_include(revision.m4)
+m4_ifndef([moo_version_detail], [m4_define([moo_version_detail],[])])
+
+AC_INIT([medit],[moo_version[]moo_version_detail],[muntyan@tamu.edu],[medit])
 AM_INIT_AUTOMAKE([foreign])
 AC_CANONICAL_HOST
 
 AC_CONFIG_HEADERS(config.h)
-MOO_DEFINE_VERSIONS(moo, AC_PACKAGE_VERSION)
+MOO_DEFINE_VERSIONS(moo,[moo_version],[moo_version_detail])
 MOO_DEFINE_MODULE_VERSIONS(1,0)
 
 MOO_AC_I18N(moo)
diff --git a/gen-revision-m4 b/gen-revision-m4
new file mode 100644
index 00000000..ac10560b
--- /dev/null
+++ b/gen-revision-m4
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+if [ -z "$node" ]; then
+  node=`hg log -r tip --template {node} 2>/dev/null`
+fi
+
+node=`echo $node | head -c 12`
+
+cat > revision.m4 << _EOFEOF
+m4_define([moo_version_detail], [.$node])
+_EOFEOF
diff --git a/medit/medit.rc.in b/medit/medit.rc.in
index 319b471a..65e20fff 100644
--- a/medit/medit.rc.in
+++ b/medit/medit.rc.in
@@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
         VALUE "CompanyName", "http://mooedit.sourceforge.net/"
         VALUE "FileDescription", "medit text editor"
-        VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
+        VALUE "FileVersion", @MOO_VERSION@
         VALUE "InternalName", "medit-@MOO_VERSION_UNQUOTED@"
         VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
         VALUE "OriginalFilename", "medit.exe"
diff --git a/moo/libmoo.rc.in b/moo/libmoo.rc.in
index f36b1325..7300dfae 100644
--- a/moo/libmoo.rc.in
+++ b/moo/libmoo.rc.in
@@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
         VALUE "CompanyName", "http://mooedit.sourceforge.net/"
         VALUE "FileDescription", "libmoo"
-        VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
+        VALUE "FileVersion", @MOO_VERSION@
         VALUE "InternalName", "libmoo-@MOO_VERSION_UNQUOTED@"
         VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
         VALUE "OriginalFilename", "libmoo.dll"
diff --git a/moo/moo.rc.in b/moo/moo.rc.in
index 209d37f5..5ea70f67 100644
--- a/moo/moo.rc.in
+++ b/moo/moo.rc.in
@@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
         VALUE "CompanyName", "http://mooedit.sourceforge.net/"
         VALUE "FileDescription", "libmoo bindings for python"
-        VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
+        VALUE "FileVersion", @MOO_VERSION@
         VALUE "InternalName", "moo-mod-@MOO_VERSION_UNQUOTED@"
         VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
         VALUE "OriginalFilename", "moo.pyd"
diff --git a/moo/pymoo.rc.in b/moo/pymoo.rc.in
index 0953bf99..9a400e69 100644
--- a/moo/pymoo.rc.in
+++ b/moo/pymoo.rc.in
@@ -16,7 +16,7 @@ VS_VERSION_INFO VERSIONINFO
       BEGIN
         VALUE "CompanyName", "http://mooedit.sourceforge.net/"
         VALUE "FileDescription", "python plugin for medit"
-        VALUE "FileVersion", "@MOO_VERSION_UNQUOTED@.0"
+        VALUE "FileVersion", @MOO_VERSION@
         VALUE "InternalName", "pymoo-@MOO_VERSION_UNQUOTED@"
         VALUE "LegalCopyright", "(C) 2004-2008 by Yevgen Muntyan <muntyan@tamu.edu>"
         VALUE "OriginalFilename", "pymoo.dll"
diff --git a/ugly/m4/moo-version.m4 b/ugly/m4/moo-version.m4
index 08ab8031..314a57ea 100644
--- a/ugly/m4/moo-version.m4
+++ b/ugly/m4/moo-version.m4
@@ -9,18 +9,18 @@ $1[]_MICRO_VERSION=`echo "$2" | $SED 's/[[^.]][[^.]]*.[[^.]][[^.]]*.\(.*\)/\1/'`
 ])
 
 ##############################################################################
-# MOO_DEFINE_VERSIONS(pkg,version)
+# MOO_DEFINE_VERSIONS(pkg,version,detail)
 #
 AC_DEFUN([MOO_DEFINE_VERSIONS],[
 _MOO_SPLIT_VERSION([m4_toupper($1)], [$2])
-m4_toupper($1)_VERSION=\"$2\"
-m4_toupper($1)_VERSION_UNQUOTED=$2
+m4_toupper($1)_VERSION=\"[$2][$3]\"
+m4_toupper($1)_VERSION_UNQUOTED=[$2][$3]
+AC_DEFINE(m4_toupper($1)_VERSION, ["$2" "$3"], [$1 version])
 AC_SUBST(m4_toupper($1)_VERSION)
 AC_SUBST(m4_toupper($1)_VERSION_UNQUOTED)
 AC_SUBST(m4_toupper($1)_MAJOR_VERSION)
 AC_SUBST(m4_toupper($1)_MINOR_VERSION)
 AC_SUBST(m4_toupper($1)_MICRO_VERSION)
-AC_DEFINE(m4_toupper($1)_VERSION, ["$2"], [$1 version])
 AC_DEFINE_UNQUOTED(m4_toupper($1)_MAJOR_VERSION, [$[]m4_toupper($1)_MAJOR_VERSION], [$1 major version])
 AC_DEFINE_UNQUOTED(m4_toupper($1)_MINOR_VERSION, [$[]m4_toupper($1)_MINOR_VERSION], [$1 minor version])
 AC_DEFINE_UNQUOTED(m4_toupper($1)_MICRO_VERSION, [$[]m4_toupper($1)_MICRO_VERSION], [$1 micro version])