diff --git a/Makefile.am b/Makefile.am
index 7da514dda1..271f0346ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,8 @@ ACLOCAL_AMFLAGS = -I autoconf/m4
 ## Black magic (read: sed) for getting the product ID as defined in code, not by the autotools.
 ## Quotes are making vim's highlighting of this even worse, so just escape everything,
 ## including the escapes. Make it lowercase to match ArchHooks::MountInitialFileSystems().
-productID := $(shell sed -nr /define\\s+PRODUCT_ID_BARE/\{s/.*define\\s+PRODUCT_ID_BARE\\s+\(.+\)/\\1/\;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/\;p\;q\} $(srcdir)/src/ProductInfo.h)
+## Replace space with - so package build tools won't choke on the installation directory.
+productID := $(shell sed -nr /define\\s+PRODUCT_ID_BARE/\{s/.*define\\s+PRODUCT_ID_BARE\\s+\(.+\)/\\1/\;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ\ /abcdefghijklmnopqrstuvwxyz-/\;p\;q\} $(srcdir)/src/ProductInfo.h)
 
 installFiles = src/stepmania
 if HAVE_GTK
@@ -26,14 +27,14 @@ dist-hook: SMData
 	cp -r -t "$(distdir)" $(installFiles)
 
 install-exec-hook:
-	mkdir -p "$(prefix)/$(productID)"
-	$(INSTALL) $(installFiles) "$(prefix)/$(productID)"
+	mkdir -p "$(DESTDIR)$(prefix)/$(productID)"
+	$(INSTALL) $(installFiles) "$(DESTDIR)$(prefix)/$(productID)"
 
 install-data-local:
-	cp -r -t "$(prefix)/$(productID)" $(installData)
-	mkdir -p "$(prefix)/$(productID)/Songs"
+	mkdir -p "$(DESTDIR)$(prefix)/$(productID)/Songs"
+	cp -r -t "$(DESTDIR)$(prefix)/$(productID)" $(installData)
 
 uninstall-hook:
-	rm -f "$(prefix)/$(productID)/stepmania"
-	rm -f "$(prefix)/$(productID)/GtkModule.so"
+	rm -f "$(DESTDIR)$(prefix)/$(productID)/stepmania"
+	rm -f "$(DESTDIR)$(prefix)/$(productID)/GtkModule.so"
 # todo: properly remove data