diff --git a/ChangeLog b/ChangeLog
index 4f479ef2..22ad5d40 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-09  Giuseppe Scrivano  <gscrivano@southpole.se>
+
+	* build-aux/bzr-version-gen: Fix some portability issues.
+
 2011-05-25  Giuseppe Scrivano  <gscrivano@gnu.org>
 
 	* bootstrap.conf (gnulib_modules): Add `strerror_r-posix'.
diff --git a/build-aux/bzr-version-gen b/build-aux/bzr-version-gen
index 82a1369a..a11eed49 100755
--- a/build-aux/bzr-version-gen
+++ b/build-aux/bzr-version-gen
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-scriptversion=2010-05-09.22; # UTC
+scriptversion=2011-08-09.13; # UTC
 
 # Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
@@ -30,14 +30,14 @@ fi
 
 DIRTY=""
 
-test -n "$(bzr diff | tr -d '\n')" && DIRTY="-dirty"
+test -n "`bzr diff | tr -d '\n'`" && DIRTY="-dirty"
 
-REVNO=$(bzr revno)
+REVNO=`bzr revno`
 
-TAG=$(bzr tags -r $REVNO | cut -d' ' -f1)
+TAG=`bzr tags -r $REVNO | cut -d' ' -f1`
 if test -z "$TAG"
 then
-    TAG=$(bzr tags -r ..$REVNO | cut -d' ' -f1)
+    TAG=`bzr tags -r ..$REVNO | cut -d' ' -f1`
 
     # No tags yet
     test -z "$TAG" && TAG="unknown"