diff --git a/debian/changelog b/debian/changelog
index f959be2be344aea207143894ebae984464fb558b..927147a4615b30bb20a96a8abcbda4df233af028 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cl-base64 (3.3.3-2) unstable; urgency=low
+
+  * Convert to dh-lisp
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 03 Aug 2009 10:21:24 -0600
+
 cl-base64 (3.3.3-1) unstable; urgency=low
 
   * New upstream
diff --git a/debian/control b/debian/control
index 66f541c317a24d4138f740ea9a3675fd6be22959..318dc71674ecefc9551dbe4cb0f0555a3a60c980 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@ Source: cl-base64
 Section: lisp
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
+Build-Depends-Indep: dh-lisp
 Build-Depends: debhelper (>= 7.0.0)
 Standards-Version: 3.8.2.0
 Vcs-Git: git://git.b9.com/cl-base64.git
@@ -9,7 +10,7 @@ Homepage: http://files.b9.com/cl-base64/
 
 Package: cl-base64
 Architecture: all
-Depends: common-lisp-controller (>= 3.47), cl-kmrcl
+Depends: ${misc:Depends}, cl-kmrcl
 Description: Common Lisp package to encode and decode base64 with URI support
  This package provides highly optimized base64 encoding and decoding.
  Besides conversion to and from strings, integer conversions are supported.
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100755
index 40ae7d75b092a32e0d97f0064d3448cbbae13117..0000000000000000000000000000000000000000
--- a/debian/postinst
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh
-set -e
-
-LISP_PKG=cl-base64
-
-case "$1" in
-    configure)
-	register-common-lisp-source ${LISP_PKG}
-	;;
-    abort-upgrade|abort-remove|abort-deconfigure)
-	;;
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-	;;
-esac
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/prerm b/debian/prerm
deleted file mode 100755
index 698ab1a2743438377b55476d95c8ed963ebc6887..0000000000000000000000000000000000000000
--- a/debian/prerm
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh
-set -e
-
-LISP_PKG=cl-base64
-
-case "$1" in
-    remove|upgrade|deconfigure)
-	unregister-common-lisp-source ${LISP_PKG}
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/rules b/debian/rules
index b78ec061a6e96f00791513d11c96254d97a426c6..dba82141a361e898b2c262107c58369dec5f4362 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,57 +1,44 @@
 #!/usr/bin/make -f
 
-pkg	:= cl-base64
-debpkg  := cl-base64
+pkg		:= cl-base64
+debpkg  	:= cl-base64
 
 clc-source	:= usr/share/common-lisp/source
 clc-systems	:= usr/share/common-lisp/systems
-clc-base64	:= $(clc-source)/$(pkg)
-
+clc-files	:= $(clc-source)/$(pkg)
 doc-dir		:= usr/share/doc/$(debpkg)
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	touch configure-stamp
-
-
-build: build-stamp
-
-build-stamp: configure-stamp 
-	dh_testdir
-	touch build-stamp
+build:
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
-	rm -f debian/cl-base64.postinst.* debian/cl-base64.prerm.*
 	dh_clean
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installdirs $(clc-systems) $(clc-base64)
-	dh_install *.asd $(shell echo *.lisp) $(clc-base64)
-	dh_link $(clc-base64)/cl-base64.asd $(clc-systems)/cl-base64.asd
-
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir -i
-	dh_testroot -i
-	dh_installdocs -i
-	dh_installchangelogs -i
-	dh_strip -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-binary-arch: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary install configure
+	dh_installdirs
+	dh_install $(pkg).asd $(clc-files)
+	dh_install *.lisp $(clc-files)
+
+binary-indep: install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs
+	dh_installdocs
+	dh_lisp
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch:
+
+binary: binary-indep
+
 
+.PHONY: build clean binary-indep binary-arch binary install