diff --git a/.gitignore b/.gitignore
index 6e2d4437..27455cd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ cdist/version.py
 /cdist-*.tar.gz
 /pkg
 /src
+build
diff --git a/Makefile b/Makefile
index f4fd36b1..c9fa387b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,49 @@
-DIST=dist-tag dist-branch-merge dist-pypi dist-archlinux-makepkg
-PUBLISH=web man-pub pub dist-blog dist-freecode dist-ml dist-manual dist-archlinux-aur-upload
+#
+# 2013 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
 
+DIST=dist-tag dist-branch-merge dist-pypi dist-archlinux-makepkg
+RELEASE=web release-man pub release-blog dist-freecode dist-ml dist-manual dist-archlinux-aur-upload
 
-%:
-	./build-cdist $@
+version:
 
 $(DIST): dist-check
+$(RELEASE): $(DIST)
+
 
 dist: $(DIST)
 	echo "Run \"make release\" to release to the public"
 
-release:
+release: $(RELEASE)
+
+man: mangen mantype manbuild
+
+man-pub: man
+
+dist-archlinux: dist-pypi
+
+dist-archlinux-makepkg: PKGBUILD
+	makepkg -c --source
+
+PKGBUILD: PKGBUILD.in
+	./PKGBUILD.in
+
+%:
+	./build-helper $@
+
diff --git a/build-cdist b/build-helper
similarity index 100%
rename from build-cdist
rename to build-helper