diff --git a/bin/build-helper b/bin/build-helper
index 55c75ef4..ff628847 100755
--- a/bin/build-helper
+++ b/bin/build-helper
@@ -245,7 +245,7 @@ eof
         "$0" pep8
 
         # Generate version file to be included in packaging
-        "$0" version
+        "$0" target-version
 
         # Ensure the git status is clean, else abort
         if ! git diff-index --name-only --exit-code HEAD ; then
@@ -382,6 +382,11 @@ eof
         echo "VERSION = \"$(git describe)\"" > cdist/version.py
     ;;
 
+    target-version)
+        target_version=$($0 changelog-version)
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
+    ;;
+
     *)
         echo "Unknown helper target $@ - aborting"
         exit 1
diff --git a/bin/build-helper.freebsd b/bin/build-helper.freebsd
index 9051ab0d..e5b081ff 100755
--- a/bin/build-helper.freebsd
+++ b/bin/build-helper.freebsd
@@ -280,7 +280,7 @@ eof
         "$0" pep8
 
         # Generate version file to be included in packaging
-        "$0" version
+        "$0" target-version
 
         # Ensure the git status is clean, else abort
         if ! git diff-index --name-only --exit-code HEAD ; then
@@ -444,6 +444,11 @@ eof
         echo "VERSION = \"$(git describe)\"" > cdist/version.py
     ;;
 
+    target-version)
+        target_version=$($0 changelog-version)
+        echo "VERSION = \"${target_version}\"" > cdist/version.py
+    ;;
+
     *)
         echo "Unknown helper target $@ - aborting"
         exit 1