diff --git a/GNUmakefile b/GNUmakefile
index 3bbf1c3..bd54c60 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,10 +3,13 @@ FILES := $(wildcard oni-*.el)
 PACKAGE_TARGETS := $(addprefix package-,$(FILES))
 
 define upload =
-	emacs --batch \
+	emacs --quick --batch \
+	    --eval "(setq package-user-dir \"local-elpa/\")" \
 	    --load oni-package.el \
 	    --funcall package-initialize \
-	    --eval "(package-upload-file $1)"
+	    --eval "(let ((package-archive-upload-base \"bin/\")) \
+                  (mkdir package-archive-upload-base t) \
+                  (package-upload-file $1))"
 endef
 
 define upload-multi-file =