diff --git a/bin/copy_binaries_to_deploy.sh b/bin/copy_binaries_to_deploy.sh
new file mode 100755
index 00000000..26595acd
--- /dev/null
+++ b/bin/copy_binaries_to_deploy.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+if [ "$#" -ne 2 ] || ! [ -d "$1" ] || ! [ -d "$2" ]; then
+  echo "Usage: $0 <BUILD-DIR> <REPO-DIR>" >&2
+  exit 1
+fi
+
+builddir="$1"
+repodir="$2"
+echo build directory = $builddir
+echo repository root dirrectory = $repodir
+
+echo Copying binaries
+cp -v "$builddir"/bin/hyperiond       "$repodir"/deploy
+cp -v "$builddir"/bin/hyperion-remote "$repodir"/deploy
+cp -v "$builddir"/bin/gpio2spi        "$repodir"/deploy
diff --git a/bin/install_hyperion.sh b/bin/install_hyperion.sh
index 550d2c7e..34b8348d 100644
--- a/bin/install_hyperion.sh
+++ b/bin/install_hyperion.sh
@@ -17,11 +17,14 @@ initctl stop hyperion
 wget github.com/tvdzwan/hyperion/raw/master/deploy/hyperiond -P /usr/bin/
 wget github.com/tvdzwan/hyperion/raw/master/deploy/hyperion-remote -P /usr/bin/
 
+# Copy the gpio changer (gpio->spi) to the /usr/bin
+wget github.com/tvdzwan/hyperion/raw/master/deploy/gpio2spi -P /usr/bin/
+
 # Copy the hyperion configuration file to /etc
 wget github.com/tvdzwan/hyperion/raw/master/config/hyperion.config.json -P /etc/
 
 # Copy the service control configuration to /etc/int
-wget github.com/tvdzwan/hyperion/raw/master/bin/hyperion.conf -P /etc/init/
+wget github.com/tvdzwan/hyperion/raw/master/deploy/hyperion.conf -P /etc/init/
 
 # Start the hyperion daemon
 initctl start hyperion
diff --git a/deploy/gpio2spi b/deploy/gpio2spi
new file mode 100755
index 00000000..f999003f
Binary files /dev/null and b/deploy/gpio2spi differ
diff --git a/deploy/hyperion-remote b/deploy/hyperion-remote
index 51d6553d..616f4ffd 100755
Binary files a/deploy/hyperion-remote and b/deploy/hyperion-remote differ
diff --git a/bin/hyperion.conf b/deploy/hyperion.conf
similarity index 100%
rename from bin/hyperion.conf
rename to deploy/hyperion.conf
diff --git a/deploy/hyperiond b/deploy/hyperiond
deleted file mode 100755
index ad8fe284..00000000
Binary files a/deploy/hyperiond and /dev/null differ
diff --git a/deploy/hyperiond.REMOVED.git-id b/deploy/hyperiond.REMOVED.git-id
new file mode 100644
index 00000000..6c19357a
--- /dev/null
+++ b/deploy/hyperiond.REMOVED.git-id
@@ -0,0 +1 @@
+6d2d16413b637a51d5b5e254ccdd86f0bebae278
\ No newline at end of file