diff --git a/MANIFEST.in b/MANIFEST.in
index 24999e9..3d33a72 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1 +1 @@
-include AUTHORS ChangeLog COPYING
+include AUTHORS ChangeLog COPYING Makefile
diff --git a/Makefile b/Makefile
index 13cfe23..3cc8b66 100644
--- a/Makefile
+++ b/Makefile
@@ -21,10 +21,6 @@
 # version: $Id$
 #
 
-PROJECT=btn4ws
-VERSION=0.7.0
-DISTBUILDDIR=tmp/$(PROJECT)-$(VERSION)
-
 install:
 	install -d $(PREFIX)/$$(gimptool --gimpplugindir)/plug-ins
 	install btn4ws.py $(PREFIX)/$$(gimptool --gimpplugindir)/plug-ins
@@ -33,15 +29,9 @@ install-user:
 	gimptool --install-bin btn4ws.py
 
 clean:
-	rm *~
+	find . -type f -name '*~' -exec rm {} \;
 
 dist:
-	mkdir -p $(DISTBUILDDIR)
-	cp btn4ws.py $(DISTBUILDDIR)
-	cp COPYING $(DISTBUILDDIR)
-	cp Makefile $(DISTBUILDDIR)
-	cp changelog $(DISTBUILDDIR)
-	cd tmp; tar c $(PROJECT)-$(VERSION) | gzip > ../../$(PROJECT)-$(VERSION).tar.gz
-	rm -r tmp
+	python setup.py sdist
 
 .PHONY: install install-user clean dist