diff --git a/configure.ac b/configure.ac
index f7676c9..ad1657d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 dnl
 dnl autoconf for ipmitool
 dnl
-m4_define([git_suffix], m4_esyscmd_s(git describe --always --dirty=wc 2>/dev/null || echo git_snapshot))
-AC_INIT([ipmitool], [1.8.18.git_suffix])
+m4_define([git_suffix], m4_esyscmd_s(./csv-revision))
+AC_INIT([ipmitool], [1.8.18git_suffix])
 AC_CONFIG_SRCDIR([src/ipmitool.c])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([foreign])
diff --git a/csv-revision b/csv-revision
new file mode 100755
index 0000000..289c133
--- /dev/null
+++ b/csv-revision
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+git describe --first-parent --tags 2>/dev/null | (
+	IFS=- read tag rev hash
+	if [ $? ] && [ -n "$rev" ]; then
+		echo .$rev.$hash
+	elif [ -d .git ]; then
+		echo .0.gsnapshot
+	fi
+)