diff --git a/Makefile.am b/Makefile.am
index 6204e22..fe3ffe1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,16 +1,26 @@
-SUBDIRS = debian src
+SUBDIRS = src
 man_MANS = isync.1
-EXTRA_DIST = isyncrc.sample isync.spec $(man_MANS)
-DISTCLEANFILES = *~ build-stamp configure-stamp
+EXTRA_DIST = debian isyncrc.sample isync.spec $(man_MANS)
 
 log:
 	@echo "me:'Michael Elkins <me@sigpipe.org>'" > .usermap
 	@echo "melkins:'Michael Elkins <me@sigpipe.org>'" >> .usermap
+	@echo "nboullis:'Nicolas Boullis <nboullis@users.sf.net>'" >> .usermap
 	@echo "ossi:'Oswald Buddenhagen <ossi@users.sf.net>'" >> .usermap
+	@echo "tytso:'Theodore Ts'o <tytso@users.sf.net>'" >> .usermap
 	cvs2cl -U .usermap --no-wrap --separate-header
 	@rm -f .usermap ChangeLog.bak
 
+deb:
+	CFLAGS="-O2 -mcpu=i686" fakeroot debian/rules binary
+
+deb-clean:
+	dh_clean -Xsrc/
+	fakeroot debian/rules unpatch
+
+distdir distclean: deb-clean
+
 rpm:
 	make dist
 	cp $(PACKAGE)-$(VERSION).tar.gz /usr/src/rpm/SOURCES
-	rpm -ba --target=i586 --clean isync.spec
+	rpm -ba --clean isync.spec
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100644
index 1d3fb1c..0000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-EXTRA_DIST = changelog compat control copyright dirs docs rules
-DISTCLEANFILES = files isync.substvars
-
-distclean-local:
-	rm -rf isync