diff --git a/.gitignore b/.gitignore
index fa424ecf..268ec4fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ po/POTFILES
 po/remove-potcdate.sed
 po/stamp-*
 osx/Info.plist
+data/man/hexchat.1
 data/pkgconfig/hexchat-plugin.pc
 data/misc/hexchat.appdata.xml
 data/misc/hexchat.desktop
diff --git a/configure.ac b/configure.ac
index eed360be..60041231 100644
--- a/configure.ac
+++ b/configure.ac
@@ -829,6 +829,7 @@ data/Makefile
 data/icons/Makefile
 data/misc/Makefile
 data/man/Makefile
+data/man/hexchat.1
 data/pkgconfig/Makefile
 data/pkgconfig/hexchat-plugin.pc
 src/Makefile
diff --git a/data/man/Makefile.am b/data/man/Makefile.am
index f833cfe1..a967701c 100644
--- a/data/man/Makefile.am
+++ b/data/man/Makefile.am
@@ -1 +1,3 @@
 man_MANS = hexchat.1
+
+EXTRA_DIST = hexchat.1.in
diff --git a/data/man/hexchat.1 b/data/man/hexchat.1.in
similarity index 94%
rename from data/man/hexchat.1
rename to data/man/hexchat.1.in
index 4208238d..1445cc94 100644
--- a/data/man/hexchat.1
+++ b/data/man/hexchat.1.in
@@ -1,4 +1,4 @@
-.TH HEXCHAT "1" "April 2013" "HexChat 2.9.6" "User Commands"
+.TH HEXCHAT "1" "April 2013" "HexChat @VERSION@" "User Commands"
 .SH NAME
 HexChat \- IRC Client
 .SH DESCRIPTION
diff --git a/osx/makebundle.sh b/osx/makebundle.sh
index df783e9a..930e72aa 100755
--- a/osx/makebundle.sh
+++ b/osx/makebundle.sh
@@ -22,4 +22,5 @@ find ./HexChat.app/Contents/Resources/lib/python2.7 -name "*.pyo" -delete
 
 echo "Compressing bundle"
 #hdiutil create -format UDBZ -srcdir HexChat.app -quiet HexChat-2.9.6.1-$(git rev-parse --short master).dmg
-zip -9rXq ./HexChat-2.9.6.1-$(git rev-parse --short master).app.zip ./HexChat.app 
+zip -9rXq ./HexChat-$(git describe --tags).app.zip ./HexChat.app
+