diff --git a/.gitignore b/.gitignore
index 15bf22137f44bbabbd51b4830d21042139ff7096..a94a9d963e3a536c3e419c7f3dd2ba29d120adf5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ doc/asdf.toc
 doc/asdf.tp
 doc/asdf.vr
 doc/asdf.vrs
+doc/asdf.t2d/
 
 # We build these at various stages in the build and test process
 LICENSE
@@ -38,3 +39,12 @@ tmp/
 *.data
 test/try-reloading-dependency.asd
 test/fileMissing.lisp
+
+# debian stuff
+build-stamp
+debian/cl-asdf.debhelper.log
+debian/cl-asdf.postinst.debhelper
+debian/cl-asdf.prerm.debhelper
+debian/cl-asdf.substvars
+debian/cl-asdf/
+debian/files
diff --git a/asdf.lisp b/asdf.lisp
index 269a579820ab71f64cb5509c64f73144329c03b9..34bfa106b864f8e950cd68e3984a658eac7e05ba 100644
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -70,7 +70,7 @@
 
 (eval-when (:load-toplevel :compile-toplevel :execute)
   (let* ((asdf-version ;; the 1+ helps the version bumping script discriminate
-          (subseq "VERSION:2.111" (1+ (length "VERSION"))))
+          (subseq "VERSION:2.004" (1+ (length "VERSION")))) ; NB: same as 2.111.
          (existing-asdf (find-package :asdf))
          (vername '#:*asdf-version*)
          (versym (and existing-asdf
diff --git a/debian/README.Debian b/debian/README.Debian
index e2177ac07145cbeb55a41ab2da10ef61c144c77a..94adc9ced99ad99b66ea0ec03445de7876908aae 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,18 +1,23 @@
 Debian Package cl-asdf
 ----------------------
 
-This package was created for Debian by Kevin M. Rosenberg
-<kmr@debian.org> in Aug 2002.  The URL for asdf is
-http://www.telent.net/cliki/asdf. The README file has details
-about the use of asdf.
+This package was originally created for Debian by Kevin M. Rosenberg
+<kmr@debian.org> in Aug 2002.  It is now being kept up to date by
+Francois-Rene Rideau, who also maintains the upstream ASDF project at
+	http://common-lisp.net/project/asdf/
 
-To load asdf into your Lisp system, give the command
-(load "/usr/share/common-lisp/source/asdf/asdf.lisp")
+To load ASDF into your Lisp system, you can give the command
+	(load "/usr/share/common-lisp/source/asdf/asdf.lisp")
+although in many implementations, you can just use
+	(require :asdf)
 
 Additionally, there is an optional module that you can load
 with the command
-(load "/usr/share/common-lisp/source/asdf/wild-modules.lisp")
+	(load "/usr/share/common-lisp/source/asdf/wild-modules.lisp")
 
-This package is build using darcs-buildpackage and the darcs archives can be
-downloaded from http://people.debian.org/~pvaneynd/repository/
+This package is built from the git repository at
+	git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
+This repository should be mostly identical to the release branch at
+	git://common-lisp.net/projects/asdf/asdf.git
 
+ -- Francois-Rene Rideau <fare@tunes.org>, Wed, 14 Jul 2010 13:49:26 -0400
diff --git a/debian/README.building b/debian/README.building
new file mode 100644
index 0000000000000000000000000000000000000000..5033b33322658e7743e9154ec3a8c4c9751c5f3c
--- /dev/null
+++ b/debian/README.building
@@ -0,0 +1,32 @@
+To build this package you need to get the git repository:
+
+git clone git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
+
+Get the upstream branch too:
+
+cd cl-asdf
+git checkout -t -b upstream remotes/origin/upstream
+
+Then you need to setup the following remotes:
+
+git remote add upstream git://common-lisp.net/projects/asdf/asdf.git
+
+To update the package from upstream do:
+
+git checkout upstream
+git pull upstream release:upstream
+git whatchanged
+#git tag upstream/<date> # not necessary anymore, now that we use the same as upstream.
+git checkout master
+git pull . upstream
+
+To build:
+
+git-buildpackage -uc -us
+
+please check your package with:
+
+lintian --verbose --info --display-info --md5sums *.changes
+
+Then commit any changes and either send me the diff or push this to somewhere were I can fetch it.
+ 
diff --git a/debian/changelog b/debian/changelog
index f09b23e4ddc14b0ce269a22a1ce37235e3ebf24b..c20e2a6888898abc760be724cd3d28e7754cd84c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,190 @@
-cl-asdf (1.88-1) unstable; urgency=low
+cl-asdf (2:2.004-1) unstable; urgency=low
+
+  * Imported new upstream, try not to diverge from it.
+  * Remove cl-cclan which was removed from the upstream repository.
+  * Updated Debian configuration and documentation.
+
+ -- Francois-Rene Rideau <fare@tunes.org>  Wed, 14 Jul 2010 14:06:50 -0400
+
+cl-asdf (2:1.704-1) unstable; urgency=low
+
+  * Imported new upstream.
+  * We now have a makefile for Documentation, use it
+  * Add debian/source/format for the stupid quilt mess
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 19 Apr 2010 21:37:48 +0200
+
+cl-asdf (2:1.627-1) unstable; urgency=low
+
+  * New upstream release. 
+  * Added dh_installinfo for info files. (Closes: #560290)
+  * Incorporated run-shell-command patch for LispWorks. Thanks tianchun!
+    (Closes: #457919)
+  * Added info that this version breaks clc
+  * Fix conflict with clc
+  * Small patch to make :implementation-type work for clc
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Thu, 25 Feb 2010 18:36:16 +0100
+
+cl-asdf (2:1.502-1) unstable; urgency=low
+
+  * new upstream, back to version numbers.
+  * added /etc/common-lisp/source-registry.conf.d/ directory
+  * Added README's to documentation
+  * it's debian/*.dirs not debian/*.dir\!
+  * Updated standard version, no real changes
+  * Added lintian overrides for cl-cclan
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 01 Feb 2010 07:31:06 +0100
+
+cl-asdf (1:20091221-1) unstable; urgency=low
+
+  * New upstream, version 1.374
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Thu, 31 Dec 2009 08:36:15 +0100
+
+cl-asdf (1:20090819-3) unstable; urgency=low
+
+  * Fixed the loop construct again. (Closes: #546205) 
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sat, 12 Sep 2009 10:08:23 +0100
+
+cl-asdf (1:20090819-2) unstable; urgency=low
+
+  * Fix the loop contruct. This makes ecl fail. (Closes: #545768)
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Thu, 10 Sep 2009 14:20:11 +0100
+
+cl-asdf (1:20090819-1) unstable; urgency=low
+
+  * New upstream, New homepage and new upstream repository.
+  * changed section to lisp
+  * now using debhelper v7
+  * added debian/README.building
+  * remove cvs2cl from dependencies
+  * remove upstream ChangeLog
+  * added dummy watch file
+  * added ${misc:Depends} to cl-asdf Depends
+  * Updated Standards-Version no real changes
+  * fixed Section of cl-asdf.doc-base
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Tue, 01 Sep 2009 08:20:28 +0100
+
+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
+  * Fixed Vcs-Git field
+  * Changed to group maintanance
+  * recreated upstream changelog with git2cl
+  * Changed directory, so we depend on a newer clc 
+
+ -- Peter Van Eynde <pvaneynd@debian.org>  Sat, 09 Feb 2008 10:07:21 +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.dirs b/debian/cl-asdf.dirs
new file mode 100644
index 0000000000000000000000000000000000000000..0f78949869d229073bc39333fca0b606aedf18af
--- /dev/null
+++ b/debian/cl-asdf.dirs
@@ -0,0 +1,4 @@
+/usr/share/common-lisp/source/cl-asdf/
+/usr/share/doc/cl-asdf/
+/usr/share/doc/cl-asdf/examples/
+/etc/common-lisp/source-registry.conf.d/
diff --git a/debian/cl-asdf.doc-base b/debian/cl-asdf.doc-base
new file mode 100644
index 0000000000000000000000000000000000000000..05562ce59b897f47d40c81fb20ea064e89a734a4
--- /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: 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..10a48301a7e72f1c4ca5ffba79e4c55e40f307e1
--- /dev/null
+++ b/debian/cl-asdf.docs
@@ -0,0 +1,3 @@
+doc/asdf.pdf
+doc/asdf
+README
diff --git a/debian/cl-asdf.examples b/debian/cl-asdf.examples
new file mode 100644
index 0000000000000000000000000000000000000000..ab1cfb4ef2c685fde1e195236d4678c9682ee3d9
--- /dev/null
+++ b/debian/cl-asdf.examples
@@ -0,0 +1 @@
+test/*
diff --git a/debian/cl-asdf.info b/debian/cl-asdf.info
new file mode 100644
index 0000000000000000000000000000000000000000..34edad9685742a7dd51d695eb657f4fb71b6f1e2
--- /dev/null
+++ b/debian/cl-asdf.info
@@ -0,0 +1 @@
+doc/asdf.info
diff --git a/debian/cl-asdf.install b/debian/cl-asdf.install
new file mode 100644
index 0000000000000000000000000000000000000000..beba3e14c10d199ce3152a0bf245ea2e80bf12d7
--- /dev/null
+++ b/debian/cl-asdf.install
@@ -0,0 +1 @@
+asdf.lisp asdf-ecl.lisp wild-modules.lisp asdf.asd build.xcvb usr/share/common-lisp/source/cl-asdf/
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.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..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1,2 +1 @@
-4
-4
+7
diff --git a/debian/control b/debian/control
index eb1404e88fec6fb538bae045fd802bc7180c717f..146978e242fdbefd68bb62ad9329e469946f4493 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,22 @@
 Source: cl-asdf
-Section: devel
+Section: lisp
 Priority: optional
-Maintainer: Peter Van Eynde <pvaneynd@debian.org>
-Build-Depends-Indep: debhelper (>> 4.0.0), cvs2cl
-Standards-Version: 3.6.2.1
+Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org>
+Uploaders: Peter Van Eynde <pvaneynd@debian.org>,
+  Francois-Rene Rideau <fare@tunes.org>
+Build-Depends: debhelper (>> 7)
+Build-Depends-Indep: texinfo,texlive-extra-utils, texlive, texlive-generic-recommended, dh-lisp
+Standards-Version: 3.8.4
+Homepage: http://common-lisp.net/project/asdf/
+Vcs-Git: git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
 
 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), common-lisp-controller (<= 7.0)
+Breaks: common-lisp-controller (<= 7.0)
+Depends: ${misc:Depends}
 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
@@ -16,10 +25,3 @@ Description: Another System Definition Facility
  common-lisp-controller package. Unlike defsystem3 in CLC, asdf is
  object-oriented and extensible.
 
-Package: cl-cclan
-Architecture: all
-Depends: common-lisp-controller
-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
- operating systems.
diff --git a/debian/copyright b/debian/copyright
index db3d7e5a25ea483af222810e1b6cc4309664997a..116de0716cd28111b74044bb6ccecff814184ffc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,6 +7,10 @@ It was downloaded from SourceForge CVS server with the below commands:
     cvs -z3 -d:pserver:anonymous@cvs.cclan.sourceforge.net:/cvsroot/cclan \
          co asdf
 
+The debian related changes and files are licensed according to the GPL-v2, see
+/usr/share/common-licenses/GPL-2
+
+
 Upstream Authors: Dan Barlow <dan@telent.net> & Contributors
 
 Copyright:
@@ -14,7 +18,7 @@ Copyright:
 (This is the MIT / X Consortium license as taken from 
  http://www.opensource.org/licenses/mit-license.html)
 
-Copyright (c) 2001, 2002 Daniel Barlow and contributors
+Copyright (c) 2001-2007 Daniel Barlow and contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index e845566c06f9bf557d35e8292c37cf05d97a9769..0000000000000000000000000000000000000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README
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..f2ef372ec20bf8de6fc9fe99bcba9b4558417160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,86 +1,53 @@
 #!/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.
+	make -C doc all
 	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 -C doc veryclean
 	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
-	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
-	dh_installinfo
-#	dh_undocumented
-	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_strip
-	dh_compress
-	dh_fixperms
-#	dh_makeshlibs
-	dh_installdeb
-#	dh_perl
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
+# Build architecture-independent files here.
+binary-indep: build
+	dh_testdir -i
+	dh_testroot -i
+	dh_prep -i
+	chmod +x test/run-tests.sh 
+	dh_installdirs -i
+	dh_install -i
+	dh_lisp -i
+	dh_installdocs -i
+	dh_installinfo -i
+	dh_installexamples -i
+	dh_installchangelogs 
+	dh_link --verbose -i
+	dh_strip -i
+	dh_compress -i
+	dh_fixperms -i
+	dh_installdeb -i
+	dh_shlibdeps -i
+	dh_gencontrol -i
+	dh_md5sums -i
+	dh_builddeb -i
+
+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
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000000000000000000000000000000000000..d3827e75a5cadb9fe4a27e1cb9b6d192e7323120
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+1.0
diff --git a/debian/updated-with-git-importcvs b/debian/updated-with-git-importcvs
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000000000000000000000000000000000000..e5f4c7c9f859996b872d27caf70085e6d83858cf
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1 @@
+# upstream uses git which we track
diff --git a/doc/Makefile b/doc/Makefile
index d6d7b1c03c2660e202a5e43e070559593214c1db..7057093c6f8eaac12b988822cde4c0db7611b7c6 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -27,4 +27,4 @@ clean:
 	rm -f ${intermediate}
 veryclean: clean
 	rm -f asdf.html asdf.pdf asdf.info
-	rm -rf asdf/
+	rm -rf asdf/ asdf.t2d/