=== modified file 'configure'
--- configure	2013-06-01 23:58:55 +0000
+++ configure	2013-08-19 02:47:24 +0000
@@ -528,8 +528,10 @@
 	echo 'Install xmlto if you want online help to work.'
 fi
 
+BITLBEE_VERSION=`grep -wm1 BITLBEE_VERSION $srcdir/bitlbee.h | sed 's/.*\"\(.*\)\".*/\1/'`
+
 echo
-if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
+if [ -d .bzr ] && type bzr > /dev/null 2> /dev/null; then
 	nick=`bzr nick`
 	if [ -n "$nick" -a "$nick" != "bitlbee" ]; then
 		nick="-$nick"
@@ -538,13 +540,11 @@
 	fi
 	rev=`bzr revno`
 	echo 'Using bzr revision #'$rev' as version number'
-	BITLBEE_VERSION=\"bzr$nick-$rev\"
-fi
+	BITLBEE_VERSION=$BITLBEE_VERSION-bzr$nick-$rev
 
-if [ -n "$BITLBEE_VERSION" ]; then
 	echo 'Spoofing version number: '$BITLBEE_VERSION
 	echo '#undef BITLBEE_VERSION' >> config.h
-	echo '#define BITLBEE_VERSION '$BITLBEE_VERSION >> config.h
+	echo '#define BITLBEE_VERSION "'$BITLBEE_VERSION'"' >> config.h
 	echo
 fi