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 4c92cb1b6a3d6d76add65b5afa4e1f5016e91faf..1814262861cb63e1d028f5d571e030b6a419dc9a 100644
--- a/asdf.lisp
+++ b/asdf.lisp
@@ -2190,8 +2190,8 @@ Returns the new tree (which probably shares structure with the old one)"
   (dolist (name +asdf-methods+)
     (let ((keyword (intern (symbol-name name) :keyword)))
       (loop :for data = rest :then (cddr data)
-        :for key = (when data (first data))
-        :for value = (when data (second data))
+        :for key = (first data)
+        :for value = (second data)
         :while data
         :when (eq key keyword) :do
         (destructuring-bind (op qual (o c) &body body) value
diff --git a/debian/README.Debian b/debian/README.Debian
index d356501519aeb9e625062f515de00a3460603129..94adc9ced99ad99b66ea0ec03445de7876908aae 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -1,17 +1,23 @@
 Debian Package cl-asdf
 ----------------------
 
-This package was created for Debian by Kevin M. Rosenberg
-<kmr@debian.org> in Aug 2002.  asdf is not maintained 
-in git at http://common-lisp.net/project/asdf/asdf.git 
+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
index 6b1ceeafa9a154bf859089d35f8b05794645c929..5033b33322658e7743e9154ec3a8c4c9751c5f3c 100644
--- a/debian/README.building
+++ b/debian/README.building
@@ -1,6 +1,6 @@
 To build this package you need to get the git repository:
 
-git clone http://git.debian.org/git/pkg-common-lisp/cl-asdf.git
+git clone git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
 
 Get the upstream branch too:
 
@@ -9,14 +9,14 @@ git checkout -t -b upstream remotes/origin/upstream
 
 Then you need to setup the following remotes:
 
-git remote add upstream http://common-lisp.net/project/asdf/asdf.git
+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 master:upstream
+git pull upstream release:upstream
 git whatchanged
-git tag upstream/<date>
+#git tag upstream/<date> # not necessary anymore, now that we use the same as upstream.
 git checkout master
 git pull . upstream
 
diff --git a/debian/changelog b/debian/changelog
index 805b8cdeebaebbb82d59b758f6bf55477c789fff..c20e2a6888898abc760be724cd3d28e7754cd84c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-cl-asdf (2:1.704-2) UNRELEASED; urgency=low
+cl-asdf (2:2.004-1) unstable; urgency=low
 
-  * open for changes
+  * Imported new upstream, try not to diverge from it.
+  * Remove cl-cclan which was removed from the upstream repository.
+  * Updated Debian configuration and documentation.
 
- -- Peter Van Eynde <pvaneynd@debian.org>  Mon, 19 Apr 2010 21:45:07 +0200
+ -- Francois-Rene Rideau <fare@tunes.org>  Wed, 14 Jul 2010 14:06:50 -0400
 
 cl-asdf (2:1.704-1) unstable; urgency=low
 
diff --git a/debian/cl-asdf.examples b/debian/cl-asdf.examples
index e19255845ca31c01858b458273b9c780a11e33db..ab1cfb4ef2c685fde1e195236d4678c9682ee3d9 100644
--- a/debian/cl-asdf.examples
+++ b/debian/cl-asdf.examples
@@ -1 +1 @@
-test/*
\ No newline at end of file
+test/*
diff --git a/debian/cl-asdf.install b/debian/cl-asdf.install
index 16aeedb2b7c028db14e9c8dea94ba52f6517010f..beba3e14c10d199ce3152a0bf245ea2e80bf12d7 100644
--- a/debian/cl-asdf.install
+++ b/debian/cl-asdf.install
@@ -1 +1 @@
-asdf.lisp wild-modules.lisp asdf-install.lisp usr/share/common-lisp/source/cl-asdf/
\ No newline at end of file
+asdf.lisp asdf-ecl.lisp wild-modules.lisp asdf.asd build.xcvb usr/share/common-lisp/source/cl-asdf/
diff --git a/debian/cl-cclan.dirs b/debian/cl-cclan.dirs
deleted file mode 100644
index 3f1ce14dc0df11d948b6d1659653ea94bbdeb85a..0000000000000000000000000000000000000000
--- a/debian/cl-cclan.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/common-lisp/source/cl-cclan/
-/usr/share/doc/cl-cclan/
diff --git a/debian/cl-cclan.docs b/debian/cl-cclan.docs
deleted file mode 100644
index e845566c06f9bf557d35e8292c37cf05d97a9769..0000000000000000000000000000000000000000
--- a/debian/cl-cclan.docs
+++ /dev/null
@@ -1 +0,0 @@
-README
diff --git a/debian/cl-cclan.install b/debian/cl-cclan.install
deleted file mode 100644
index b208754ab921b1096b012f13c1859200317458e8..0000000000000000000000000000000000000000
--- a/debian/cl-cclan.install
+++ /dev/null
@@ -1 +0,0 @@
-cclan-package.lisp cclan.lisp cclan.asd usr/share/common-lisp/source/cl-port/
diff --git a/debian/cl-cclan.lintian-overrides b/debian/cl-cclan.lintian-overrides
deleted file mode 100644
index 2a0e1f8e2cef9704f1ce5a4529ad7371809dffb4..0000000000000000000000000000000000000000
--- a/debian/cl-cclan.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# usr/share/common-lisp/source/cl-cclan/ is always empty
-cl-cclan binary: package-contains-empty-directory
diff --git a/debian/control b/debian/control
index 65be3bb2d0b26e5da10b77160b9f521707a55430..146978e242fdbefd68bb62ad9329e469946f4493 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: cl-asdf
 Section: lisp
 Priority: optional
 Maintainer: Debian Common Lisp Team <pkg-common-lisp-devel@lists.alioth.debian.org>
-Uploaders: Peter Van Eynde <pvaneynd@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: http://git.debian.org/git/pkg-common-lisp/cl-asdf.git
+Vcs-Git: git://git.debian.org/git/pkg-common-lisp/cl-asdf.git
 
 Package: cl-asdf
 Architecture: all
@@ -24,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: ${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
- operating systems.
diff --git a/debian/rules b/debian/rules
index 10c7f1bb6ab3f90cbde1cf5886e4e4e121c5196a..f2ef372ec20bf8de6fc9fe99bcba9b4558417160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
-	make -C doc clean
+	make -C doc veryclean
 	dh_clean
 
 # Build architecture-dependent files here.
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/