diff --git a/Makefile b/Makefile
index a2b9e235..cfc3c14c 100644
--- a/Makefile
+++ b/Makefile
@@ -48,17 +48,19 @@ dist: distclean
 	[ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
 	[ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
 	mkdir i3-${VERSION}
-	cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop pseudo-doc.doxygen Makefile i3-${VERSION}
-	cp -r src i3-msg i3-input include man i3-${VERSION}
+	cp DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen Makefile i3-${VERSION}
+	cp -r src i3-msg include man i3-${VERSION}
 	# Only copy toplevel documentation (important stuff)
 	mkdir i3-${VERSION}/docs
 	find docs -maxdepth 1 -type f ! -name "*.xcf" -exec cp '{}' i3-${VERSION}/docs \;
+	# Only copy source code from i3-input
+	mkdir i3-${VERSION}/i3-input
+	find i3-input -maxdepth 1 -type f \( -name "*.c" -or -name "*.h" -or -name "Makefile" \) -exec cp '{}' i3-${VERSION}/i3-input \;
 	sed -e 's/^GIT_VERSION=\(.*\)/GIT_VERSION=${GIT_VERSION}/g;s/^VERSION=\(.*\)/VERSION=${VERSION}/g' common.mk > i3-${VERSION}/common.mk
 	# Pre-generate a manpage to allow distributors to skip this step and save some dependencies
 	make -C man
-	cp man/i3.1 i3-${VERSION}/man/i3.1
-	tar cf i3-${VERSION}.tar i3-${VERSION}
-	bzip2 -9 i3-${VERSION}.tar
+	cp man/*.1 i3-${VERSION}/man/
+	tar cfj i3-${VERSION}.tar.bz2 i3-${VERSION}
 	rm -rf i3-${VERSION}
 
 clean: