diff --git a/Makefile b/Makefile
index 0213482..6146c0d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,27 +5,7 @@ PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
 BUILDDIR = build
 
-BINPROGS = \
-	archco \
-	arch-nspawn \
-	archrelease \
-	archbuild \
-	checkpkg \
-	commitpkg \
-	crossrepomove\
-	diffpkg \
-	export-pkgbuild-keys \
-	finddeps \
-	find-libdeps \
-	lddd \
-	makerepropkg \
-	mkarchroot \
-	makechrootpkg \
-	offload-build \
-	rebuildpkgs \
-	sogrep
-BINPROGS := $(addprefix $(BUILDDIR)/bin/,$(BINPROGS))
-
+BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
 MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
 PACMAN_CONFIGS=$(wildcard config/pacman/*)
 SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
@@ -89,6 +69,9 @@ completion: $(COMPLETIONS)
 man: $(MANS)
 
 
+ifneq ($(wildcard *.in),)
+	$(error Legacy in prog file found: $(wildcard *.in) - please migrate to src/*)
+endif
 ifneq ($(wildcard pacman-*.conf),)
 	$(error Legacy pacman config file found: $(wildcard pacman-*.conf) - please migrate to config/pacman/*)
 endif
@@ -112,7 +95,7 @@ $(1)/%: $(2)%.in
 	@bash -O extglob -n "$$@"
 endef
 
-$(eval $(call buildInScript,build/bin,,555))
+$(eval $(call buildInScript,build/bin,src/,555))
 $(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444)))
 
 $(BUILDDIR)/doc/%: doc/%.asciidoc doc/asciidoc.conf doc/footer.asciidoc
diff --git a/arch-nspawn.in b/src/arch-nspawn.in
similarity index 100%
rename from arch-nspawn.in
rename to src/arch-nspawn.in
diff --git a/archbuild.in b/src/archbuild.in
similarity index 100%
rename from archbuild.in
rename to src/archbuild.in
diff --git a/archco.in b/src/archco.in
similarity index 100%
rename from archco.in
rename to src/archco.in
diff --git a/archrelease.in b/src/archrelease.in
similarity index 100%
rename from archrelease.in
rename to src/archrelease.in
diff --git a/checkpkg.in b/src/checkpkg.in
similarity index 100%
rename from checkpkg.in
rename to src/checkpkg.in
diff --git a/commitpkg.in b/src/commitpkg.in
similarity index 100%
rename from commitpkg.in
rename to src/commitpkg.in
diff --git a/crossrepomove.in b/src/crossrepomove.in
similarity index 100%
rename from crossrepomove.in
rename to src/crossrepomove.in
diff --git a/diffpkg.in b/src/diffpkg.in
similarity index 100%
rename from diffpkg.in
rename to src/diffpkg.in
diff --git a/export-pkgbuild-keys.in b/src/export-pkgbuild-keys.in
similarity index 100%
rename from export-pkgbuild-keys.in
rename to src/export-pkgbuild-keys.in
diff --git a/find-libdeps.in b/src/find-libdeps.in
similarity index 100%
rename from find-libdeps.in
rename to src/find-libdeps.in
diff --git a/finddeps.in b/src/finddeps.in
similarity index 100%
rename from finddeps.in
rename to src/finddeps.in
diff --git a/lddd.in b/src/lddd.in
similarity index 100%
rename from lddd.in
rename to src/lddd.in
diff --git a/makechrootpkg.in b/src/makechrootpkg.in
similarity index 100%
rename from makechrootpkg.in
rename to src/makechrootpkg.in
diff --git a/makerepropkg.in b/src/makerepropkg.in
similarity index 100%
rename from makerepropkg.in
rename to src/makerepropkg.in
diff --git a/mkarchroot.in b/src/mkarchroot.in
similarity index 100%
rename from mkarchroot.in
rename to src/mkarchroot.in
diff --git a/offload-build.in b/src/offload-build.in
similarity index 100%
rename from offload-build.in
rename to src/offload-build.in
diff --git a/rebuildpkgs.in b/src/rebuildpkgs.in
similarity index 100%
rename from rebuildpkgs.in
rename to src/rebuildpkgs.in
diff --git a/sogrep.in b/src/sogrep.in
similarity index 100%
rename from sogrep.in
rename to src/sogrep.in