diff --git a/GNUmakefile b/GNUmakefile
index a8ec5c5..5fa67ef 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,6 +1,8 @@
 FILES := $(wildcard oni-*.el)
+DIRECTORIES := $(wildcard oni-*/)
 
 PACKAGE_TARGETS := $(addprefix package-,$(FILES))
+MULTIPACKAGE_TARGETS := $(addprefix multipackage-,$(subst /, ,$(DIRECTORIES)))
 
 define upload =
 	emacs --batch \
@@ -14,49 +16,13 @@ define upload-multi-file =
 	cp $1/dist/$1-readme.txt bin/
 endef
 
-package: $(PACKAGE_TARGETS) package-oni-conf package-oni-css package-oni-elisp \
-    package-oni-haml package-oni-html package-oni-nxml package-oni-org \
-    package-oni-php package-oni-python package-oni-ruby package-oni-twig \
-    package-oni-csharp
+package: $(PACKAGE_TARGETS) $(MULTIPACKAGE_TARGETS)
 
 package-%: %
 	$(call upload,\"$^\")
 
-package-oni-conf:
-	$(call upload-multi-file,oni-conf)
-
-package-oni-css:
-	$(call upload-multi-file,oni-css)
-
-package-oni-elisp:
-	$(call upload-multi-file,oni-elisp)
-
-package-oni-haml:
-	$(call upload-multi-file,oni-haml)
-
-package-oni-html:
-	$(call upload-multi-file,oni-html)
-
-package-oni-nxml:
-	$(call upload-multi-file,oni-nxml)
-
-package-oni-org:
-	$(call upload-multi-file,oni-org)
-
-package-oni-php:
-	$(call upload-multi-file,oni-php)
-
-package-oni-python:
-	$(call upload-multi-file,oni-python)
-
-package-oni-ruby:
-	$(call upload-multi-file,oni-ruby)
-
-package-oni-twig:
-	$(call upload-multi-file,oni-twig)
-
-package-oni-csharp:
-	$(call upload-multi-file,oni-csharp)
+multipackage-%: %
+	$(call upload-multi-file,$^)
 
 install-%:
 	emacs --batch \