diff --git a/Makefile b/Makefile
index cf83a591..dac24394 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 
 A2XM=a2x -f manpage --no-xmllint -a encoding=UTF-8
 A2XH=a2x -f xhtml --no-xmllint -a encoding=UTF-8
-helper=./build-helper
+helper=./bin/build-helper
 
 MANDIR=docs/man
 MAN1DSTDIR=$(MANDIR)/man1
diff --git a/build-helper b/bin/build-helper
similarity index 100%
rename from build-helper
rename to bin/build-helper
diff --git a/bin/cdist b/bin/cdist
index f8fec000..645020a1 100755
--- a/bin/cdist
+++ b/bin/cdist
@@ -25,7 +25,7 @@ dir=${0%/*}
 
 # Ensure version is present - the bundled/shipped version contains a static version,
 # the git version contains a dynamic version
-"$dir/../build-helper" version
+"$dir/build-helper" version
 
 libdir=$(cd "${dir}/../" && pwd -P)
 export PYTHONPATH="${libdir}"