diff --git a/debian/changelog b/debian/changelog
index 20a4a1f..6aa6fd2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ isync (0.9-1) unstable; urgency=low
 
   * New upstream release
 
- -- Michael Elkins <me@mutt.org>  Tue, 18 Jun 2002 17:36:21 -0700
+ -- Oswald Buddenhagen <ossi@users.sf.net>  Wed, 26 Mar 2003 04:12:00 +0100
 
 isync (0.8-1) unstable; urgency=low
 
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index fa7b763..1024ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
 Source: isync
-Section: unknown
+Section: mail
 Priority: optional
 Maintainer: Oswald Buddenhagen <ossi@users.sf.net>
-Build-Depends: debhelper (>> 3.0.0)
-Standards-Version: 3.5.2
+Build-Depends: debhelper (>= 3), dpkg-dev (>= 1.9.0), libdb-dev
+Standards-Version: 3.5.8
 
 Package: isync
 Architecture: any
 Depends: ${shlibs:Depends}
+Suggests: mutt
 Description: Synchronize a local maildir with a remote IMAP4 mailbox
  A command line application which synchronizes a local maildir-style
  mailbox with a remote IMAP4 mailbox, suitable for use in
diff --git a/debian/dirs b/debian/dirs
new file mode 100644
index 0000000..e772481
--- /dev/null
+++ b/debian/dirs
@@ -0,0 +1 @@
+usr/bin
diff --git a/debian/rules b/debian/rules
index d9eef51..2f2f0bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,85 +1,43 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This is the debhelper compatability version to use.
-export DH_COMPAT=3
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
-
-	touch configure-stamp
 
 build: build-stamp
-
-build-stamp: configure-stamp 
+build-stamp:
 	dh_testdir
-
-	# Add here commands to compile the package.
+	./configure --prefix=/usr --mandir=/usr/share/man
 	$(MAKE)
-	#/usr/bin/docbook-to-man debian/isync.sgml > isync.1
-
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-
-	# Add here commands to clean up after the build process.
+	rm -f build-stamp
 	-$(MAKE) distclean
-
-	dh_clean
+	dh_clean Makefile config.log config.status
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
+	dh_installdirs usr/bin usr/share/man/man1
+	$(MAKE) DESTDIR=$(CURDIR)/debian/isync install
 
-	# Add here commands to install the package into debian/isync.
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/isync
-
-
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
-	dh_installdocs
-	dh_installexamples
-#	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-	dh_installman isync.1
-#	dh_installinfo
-#	dh_undocumented
 	dh_installchangelogs ChangeLog
-	dh_link
+	dh_installdocs AUTHORS NEWS README TODO
+	dh_installexamples isyncrc.sample
+	dh_installman
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install