diff --git a/Makefile.am b/Makefile.am
index b2a617cb0b489b231ac6fc7e146b4bc39c67f1ff..98a703598c8be3e9c0b812d42997b139c5b12e9a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ACLOCAL_AMFLAGS = -I autotools
 
-SUBDIRS = man lib scripts daemons doc test tools qa
+SUBDIRS = man lib scripts daemons doc test tools qa devel
 EXTRA_DIST = NEWS DEVNOTES
 
 .PHONY: ganeti
diff --git a/configure.ac b/configure.ac
index 4d10aa110414c01061a9cd534b520f3adb7fc531..c41fac7906f7ce0401cc57aee15787953459b6e6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,6 +114,7 @@ fi
 AC_CONFIG_FILES([
   Makefile
   daemons/Makefile
+  devel/Makefile
   doc/Makefile
   doc/examples/Makefile
   lib/Makefile
diff --git a/devel/Makefile.am b/devel/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..fe2cc43c66e7268a85a20975a68dc34a191c8ac0
--- /dev/null
+++ b/devel/Makefile.am
@@ -0,0 +1,9 @@
+EXTRA_DIST = upload.in
+CLEANFILES = upload
+
+all-local: upload
+upload: upload.in
+	sed \
+	  -e 's#@PREFIX@#$(prefix)#g' \
+	< $< > $@
+	chmod u+x $@
diff --git a/devel/upload b/devel/upload.in
old mode 100755
new mode 100644
similarity index 96%
rename from devel/upload
rename to devel/upload.in
index 9543ea9c7bf3cb7f986cad572f1635be648d7366..e85587a60a007b2e924ba9a14083277602ca85de
--- a/devel/upload
+++ b/devel/upload.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Copyright (C) 2006, 2007 Google Inc.
 #
@@ -38,7 +38,7 @@ echo ---
 
 echo ---
 
-PREFIX=$(cat Makefile | grep '^prefix' | sed -e 's/.*= //')
+PREFIX='@PREFIX@'
 
 # and now put it under $prefix on the target node(s)
 for host; do