diff --git a/Makefile b/Makefile
index 19fb4f4c..ae3b0c9c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # awesome
-# © 2007 Julien Danjou
+# © 2007 Julien Danjou <julien@danjou.info>
 
 include config.mk
 
@@ -32,11 +32,13 @@ clean:
 
 dist: clean
 	@echo creating dist tarball
-	@mkdir -p awesome-${VERSION}
-	@cp -R LICENSE Makefile README config.*.h config.mk \
-	    awesome.1 awesome.h grid.h tile.h mem.h ${SRC} ${LAYOUTS} awesome-${VERSION}
+	@mkdir awesome-${VERSION}
+	@mkdir awesome-${VERSION}/layouts
+	@cp -R LICENSE AUTHORS Makefile README config.mk \
+	    awesome.1 ${SRC} ${SRC:.c=.h} awesome-${VERSION}
+	@cp -R ${LAYOUTS} ${LAYOUTS:.c=.h} awesome-${VERSION}/layouts
 	@tar -cf awesome-${VERSION}.tar awesome-${VERSION}
-	@gzip awesome-${VERSION}.tar
+	@gzip -9 awesome-${VERSION}.tar
 	@rm -rf awesome-${VERSION}
 
 install: all