diff --git a/debian/changelog b/debian/changelog
index f09b23e4ddc14b0ce269a22a1ce37235e3ebf24b..e4ff65251e30858ddafcf5364e7bdcd6c2816ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,114 @@
-cl-asdf (1.88-1) unstable; urgency=low
+cl-asdf (1.111-1) unstable; urgency=low
+
+  * New upstream release.
+  * Updated standard version without real changes
+  * Corrected Vcs-Bzr field
+  * Move to using dh-lisp
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sat, 29 Dec 2007 00:02:26 +0100
+
+cl-asdf (1.109-2) unstable; urgency=low
+
+  * stop trying to dump the package, use the package name instead.
+    (Closes: #436129)
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Thu, 27 Sep 2007 05:42:20 +0200
+
+cl-asdf (1.109-1) unstable; urgency=low
+
+  * New upstream. Major changes:
+     + main change is the addition of system-relative-pathname function. This takes a
+       system name and a partial pathname and combines them to return a new pathname
+       _relative_ to the system. This is exported and lightly documented.
+     + this patch also updates preference-file-for-system/operation in an effort
+       to prevent it from being confused by *default-pathname-defaults* that include
+       a specific name and type.
+     + Removes inline component methods more carefully (and, I believe, correctly!). Helps keep LispWorks happy.
+     + Reworked asdf tests to make them more robust and perhaps more flexible too.
+  * Now use texlive to build. 
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sun, 16 Sep 2007 14:45:57 +0200
+
+cl-asdf (1.107-1) unstable; urgency=low
+
+  * New upstream release, adding the system-relative-pathname
+    function.
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sun, 08 Apr 2007 23:05:18 +0200
+
+cl-asdf (1.106-1) experimental; urgency=low
+
+  * New upstream. Major changes:
+
+      + Minor patch in class-for-type that evaluates only *package* at read
+   time rather than (package-name *package*); this keeps case sensitive Lisps
+   happy all the time and keeps case insensitive lisps happily insensitive.
+  
+      + A patch from Richard Kreuter that allows pathname defaulting to work
+   better with *load-truename* and *default-pathname-defaults*; this makes it
+   easier to work with defsystems in the REPL.
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Wed, 14 Mar 2007 09:18:25 +0100
+
+cl-asdf (1.104-1) experimental; urgency=low
+
+  * Added XS-X-Vcs-Darcs header
+  * modified S-X-Vcs-Darcs to XS-Vcs-Darcs field
+  * New upstream. Major changes:
+     + add a better docstring for component-depends-on (via #lisp and Robert
+     Goldman)
+     + ASDF now sends output to *standard-output* (thanks to Richard M.
+     Kreuter).
+     + Slightly better SBCL_HOME treatement for SBCL.
+  * upload to experimental during the freeze
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Tue,  6 Feb 2007 08:21:06 +0100
+
+cl-asdf (1.101-1) unstable; urgency=low
+
+  * New upstream version.
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Wed, 20 Sep 2006 07:08:57 +0200
+
+cl-asdf (1.99-3) unstable; urgency=low
+
+  * Added tetex-bin to Build-Depends-Indep (Closes: #379532)
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 24 Jul 2006 19:34:49 +0200
+
+cl-asdf (1.99-2) unstable; urgency=low
+
+  * Move asdf.info files from sbcl to this package.
+  * move texinfo to BuildDependsIndep
+  * we build something build-indep 
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Fri, 30 Jun 2006 23:18:40 +0200
+
+icl-asdf (1.99-1) unstable; urgency=low
+
+  * New upstream.
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 19 Jun 2006 05:28:12 +0200
+
+cil-asdf (1.97-1) unstable; urgency=low
+
+  * New upstream release
+  * Moved debhelper to build-depeneds
+  * increased standards-version without real changes.
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sat, 20 May 2006 19:28:58 +0200
+
+
+cl-asdf (1.89-1) unstable; urgency=low
 
   * Noticed that I actually increased the version with the CVS commit
   * Updated the standards version
   * Remove the prepare build stuff, build through darcs
   * Improve duplicate names test: use equal instead of equalp.
     From a comment from Faré.
+  * Remove CVS cruft
+  * Seperate CVS version of asdf.lisp from version of package. The tag
+    is not the version of the package
 
  -- Peter Van Eynde <pvaneynd@debian.org>  Thu, 22 Sep 2005 12:52:31 +0200
 
diff --git a/debian/cl-asdf.dir b/debian/cl-asdf.dir
new file mode 100644
index 0000000000000000000000000000000000000000..53e5209a3e21264057a0796cdaa51aa1f5f995eb
--- /dev/null
+++ b/debian/cl-asdf.dir
@@ -0,0 +1,3 @@
+/usr/share/common-lisp/source/cl-asdf/
+/usr/share/doc/cl-asdf/
+/usr/share/doc/cl-asdf/examples/
\ No newline at end of file
diff --git a/debian/cl-asdf.doc-base b/debian/cl-asdf.doc-base
new file mode 100644
index 0000000000000000000000000000000000000000..d9f3f8038f643ff72d2622dac5921a603db846e3
--- /dev/null
+++ b/debian/cl-asdf.doc-base
@@ -0,0 +1,12 @@
+Document: asdf
+Title: ASDF User Manual
+Author: Danual Barlow
+Abstract: This manual describes the usage of ASDF
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/cl-asdf/asdf/index.html
+Files: /usr/share/doc/cl-asdf/asdf/*.html
+
+Format: PDF
+Files: /usr/share/doc/cl-asdf/asdf.pdf.gz
diff --git a/debian/cl-asdf.docs b/debian/cl-asdf.docs
new file mode 100644
index 0000000000000000000000000000000000000000..5b14e816d6d9cdcfd1168dead0146df8fb42171b
--- /dev/null
+++ b/debian/cl-asdf.docs
@@ -0,0 +1,2 @@
+asdf.pdf
+asdf
diff --git a/debian/cl-asdf.examples b/debian/cl-asdf.examples
new file mode 100644
index 0000000000000000000000000000000000000000..e19255845ca31c01858b458273b9c780a11e33db
--- /dev/null
+++ b/debian/cl-asdf.examples
@@ -0,0 +1 @@
+test/*
\ No newline at end of file
diff --git a/debian/cl-asdf.info b/debian/cl-asdf.info
new file mode 100644
index 0000000000000000000000000000000000000000..04a71f11c947f9e1cb599e346a2158a0056579c3
--- /dev/null
+++ b/debian/cl-asdf.info
@@ -0,0 +1 @@
+asdf.info
diff --git a/debian/cl-asdf.install b/debian/cl-asdf.install
new file mode 100644
index 0000000000000000000000000000000000000000..16aeedb2b7c028db14e9c8dea94ba52f6517010f
--- /dev/null
+++ b/debian/cl-asdf.install
@@ -0,0 +1 @@
+asdf.lisp wild-modules.lisp asdf-install.lisp usr/share/common-lisp/source/cl-asdf/
\ No newline at end of file
diff --git a/debian/cl-asdf.postinst b/debian/cl-asdf.postinst
index 6a6e3cf46da41746d9c6989d262a03f608c35062..8094f3bb81c94bd6e783a6c036bff9356705f4b0 100644
--- a/debian/cl-asdf.postinst
+++ b/debian/cl-asdf.postinst
@@ -1,5 +1,7 @@
-#! /bin/sh
-# postinst script for asdf
+#!/bin/bash
+# postinst script for common-lisp-controller
+#
+# see: dh_installdeb(1)
 
 set -e
 
@@ -11,8 +13,7 @@ set -e
 #        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
 #          <failed-install-package> <version> `removing'
 #          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
+# for details, see /usr/share/doc/packaging-manual/
 #
 # quoting from the policy:
 #     Any necessary prompting should almost always be confined to the
@@ -21,17 +22,33 @@ set -e
 #     installation fails and the `postinst' is called with `abort-upgrade',
 #     `abort-remove' or `abort-deconfigure'.
 
+
+. /usr/share/debconf/confmodule 
+
 case "$1" in
     configure)
-	if [ -x /usr/sbin/clc-reregister-all-impl ]; then 
-	    /usr/sbin/clc-reregister-all-impl
-	fi
+        #  We need to rebuild the images
+	for compiler in /usr/lib/common-lisp/bin/*.sh ; do
+	    if [ -f "$compiler" -a -r "$compiler" ] ; then
+		i=${compiler##*/}
+		i=${i%.sh}
+		if [ -x "$compiler" ] ; then
+		    echo Reinstalling for $i
+		    echo Recompiling Common Lisp Controller for $i
+		    bash "$compiler" install-clc || true
+		    echo
+		    echo Done rebuilding
+		fi 
+	    fi
+	done 
 	;;
+    
     abort-upgrade|abort-remove|abort-deconfigure)
-	;;
+    ;;
+
     *)
         echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
+        exit 0
     ;;
 esac
 
diff --git a/debian/cl-cclan.dir b/debian/cl-cclan.dir
new file mode 100644
index 0000000000000000000000000000000000000000..3f1ce14dc0df11d948b6d1659653ea94bbdeb85a
--- /dev/null
+++ b/debian/cl-cclan.dir
@@ -0,0 +1,2 @@
+/usr/share/common-lisp/source/cl-cclan/
+/usr/share/doc/cl-cclan/
diff --git a/debian/docs b/debian/cl-cclan.docs
similarity index 100%
rename from debian/docs
rename to debian/cl-cclan.docs
diff --git a/debian/cl-cclan.install b/debian/cl-cclan.install
new file mode 100644
index 0000000000000000000000000000000000000000..b208754ab921b1096b012f13c1859200317458e8
--- /dev/null
+++ b/debian/cl-cclan.install
@@ -0,0 +1 @@
+cclan-package.lisp cclan.lisp cclan.asd usr/share/common-lisp/source/cl-port/
diff --git a/debian/cl-cclan.postinst b/debian/cl-cclan.postinst
deleted file mode 100644
index 3276e880c99a8028dbdcbef4465aecc9fab4b13b..0000000000000000000000000000000000000000
--- a/debian/cl-cclan.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-pkg=cclan
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-case "$1" in
-    configure)
-	/usr/sbin/register-common-lisp-source $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/cl-cclan.prerm b/debian/cl-cclan.prerm
deleted file mode 100644
index d8cda906cb291c7fd517b94d03ab2eb1a00bfd7b..0000000000000000000000000000000000000000
--- a/debian/cl-cclan.prerm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh 
-
-set -e
-
-pkg=cclan
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-	/usr/sbin/unregister-common-lisp-source $pkg
-        ;;
-    failed-upgrade)
-        ;;
-    *)
-        echo "prerm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/compat b/debian/compat
index 7290ba859f4adbf90d68526fe0ab1f8cbcf65098..b8626c4cff2849624fb67f87cd0ad72b163671ad 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,2 +1 @@
 4
-4
diff --git a/debian/control b/debian/control
index eb1404e88fec6fb538bae045fd802bc7180c717f..4aaf021096f974dd5e52dde1998689d54e6cc80e 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,16 @@ Source: cl-asdf
 Section: devel
 Priority: optional
 Maintainer: Peter Van Eynde <pvaneynd@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cvs2cl
-Standards-Version: 3.6.2.1
+Build-Depends: debhelper (>> 4.0.0)
+Build-Depends-Indep: cvs2cl, texinfo,texlive-extra-utils, texlive, texlive-generic-recommended, dh-lisp
+Standards-Version: 3.7.3.0
+Vcs-Bzr: http://cl-debian.alioth.debian.org/repository/pvaneynd/bzr-moved/cl-asdf/
 
 Package: cl-asdf
 Architecture: all
 Recommends: common-lisp-controller, sbcl | lisp-compiler
+Replaces: sbcl-common (<= 1:0.9.13.0-2)
+Conflicts: sbcl-common (<= 1:0.9.13.0-2)
 Description: Another System Definition Facility
  asdf provides a "make" type functions for Common Lisp packages. It
  provides compilation and loading features for complex Lisp systems
@@ -18,7 +22,7 @@ Description: Another System Definition Facility
 
 Package: cl-cclan
 Architecture: all
-Depends: common-lisp-controller
+Depends: ${misc:Depends}
 Description: Comprehensive Common Lisp Archive Network
  cclan is a tool for creating a repository of Common Lisp packages.
  cclan utilizes asdf to automatically create installable packages for various
diff --git a/debian/postinst b/debian/postinst
deleted file mode 100644
index 8094f3bb81c94bd6e783a6c036bff9356705f4b0..0000000000000000000000000000000000000000
--- a/debian/postinst
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-# postinst script for common-lisp-controller
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see /usr/share/doc/packaging-manual/
-#
-# quoting from the policy:
-#     Any necessary prompting should almost always be confined to the
-#     post-installation script, and should be protected with a conditional
-#     so that unnecessary prompting doesn't happen if a package's
-#     installation fails and the `postinst' is called with `abort-upgrade',
-#     `abort-remove' or `abort-deconfigure'.
-
-
-. /usr/share/debconf/confmodule 
-
-case "$1" in
-    configure)
-        #  We need to rebuild the images
-	for compiler in /usr/lib/common-lisp/bin/*.sh ; do
-	    if [ -f "$compiler" -a -r "$compiler" ] ; then
-		i=${compiler##*/}
-		i=${i%.sh}
-		if [ -x "$compiler" ] ; then
-		    echo Reinstalling for $i
-		    echo Recompiling Common Lisp Controller for $i
-		    bash "$compiler" install-clc || true
-		    echo
-		    echo Done rebuilding
-		fi 
-	    fi
-	done 
-	;;
-    
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 0
-    ;;
-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 c993abe70d1ec4795e887eeb06629e91d1e8d117..b913fdda36f2b18bc1e594dc8799e5c72cc17795 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,86 +1,57 @@
 #!/usr/bin/make -f
-# GNU copyright 1997 to 1999 by Joey Hess.
-
-pkg=cl-asdf
-pkg-cclan=cl-cclan
-clc-base=usr/share/common-lisp
-clc-src=$(clc-base)/source
-clc-systems=$(clc-base)/systems
-asdf-files=$(clc-src)/asdf
-cclan-files=$(clc-src)/cclan
-doc-dir=usr/share/doc/$(pkg)
-
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	# Add here commands to configure the package.
-	touch configure-stamp
+# MAde with the aid of dh_make, by Craig Small
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
+# Some lines taken from debmake, by Cristoph Lameter.
 
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 build: build-stamp
-
-build-stamp: configure-stamp 
+build-stamp:
 	dh_testdir
-	# Add here commands to compile the package.
+	makeinfo asdf.texinfo
+	makeinfo --html asdf.texinfo
+	texi2pdf asdf.texinfo
 	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
+	rm asdf/*.html asdf.aux asdf.cp asdf.cps asdf.fn \
+	   asdf.fns asdf.info asdf.ky asdf.log asdf.pdf asdf.pg \
+           asdf.toc asdf.tp asdf.vr asdf.vrs  || true
+	rmdir asdf || true
 	dh_clean
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/asdf.
-	dh_installdirs -p $(pkg) $(asdf-files) $(doc-dir)/examples
-	dh_install -p $(pkg) asdf.lisp wild-modules.lisp asdf-install.lisp $(asdf-files)
-	chmod +x test/run-tests.sh
-	dh_install -p $(pkg) test/* $(doc-dir)/examples
-	dh_installdirs -p $(pkg-cclan) $(clc-systems) $(cclan-files)
-	dh_install -p $(pkg-cclan) cclan-package.lisp cclan.lisp cclan.asd $(cclan-files)
-	dh_link -p $(pkg-cclan) $(cclan-files)/cclan.asd $(clc-systems)/cclan.asd
-
-# Build architecture-independent files here.
-binary-indep: build install
+# Build architecture-dependent files here.
+binary-arch: build
 # We have nothing to do by default.
 
-# Build architecture-dependent files here.
-binary-arch: build install
+# Build architecture-independent files here.
+binary-indep: build
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
+	dh_clean -k
+	chmod +x test/run-tests.sh
+	dh_installdirs
+	dh_install
+	dh_lisp
 	dh_installdocs
-#	dh_installexamples
-	dh_installmenu
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-	dh_installcron
-	dh_installman
-	dh_installinfo
-#	dh_undocumented
+	dh_installexamples
 	dh_installchangelogs ChangeLog
-	find debian/cl-asdf -name CVS -print0 | xargs -0t rm -rf || true
-	find debian/cl-asdf -name .cvsignore -print0 | xargs -0t rm -f || true
-	dh_link
+	dh_link --verbose
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_makeshlibs
 	dh_installdeb
-#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+source diff:                                                                  
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary