diff --git a/Makefile.am b/Makefile.am
index 153d5de3d..3777267a1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,11 +3,15 @@ SUBDIRS = src data doc po intl
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                        config.h.in config.sub configure install-sh \
 		       ltconfig ltmain.sh missing mkinstalldirs \
-		       stamp-h.in acconfig.h
+		       stamp-h.in acconfig.h debian/changelog
 
 bin_SCRIPTS = enlightenment-config
 
-EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN enlightenment.spec
+EXTRA_DIST = README AUTHORS COPYING COPYING-PLAIN enlightenment.spec \
+	     debian/changelog debian/changelog.in debian/copyright \
+	     debian/rules debian/enlightenment.install debian/enlightenment.docs \
+	     debian/enlightenment-data.install debian/libe.install \
+	     debian/libe-dev.install
 
 filesdir = $(datadir)/enlightenment/
 files_DATA = AUTHORS COPYING 
diff --git a/configure.in b/configure.in
index be54ece8e..ac2ab824d 100644
--- a/configure.in
+++ b/configure.in
@@ -307,6 +307,7 @@ doc/Makefile
 po/Makefile
 intl/Makefile
 enlightenment-config
+debian/changelog
 ],[
 chmod +x enlightenment-config
 ])
diff --git a/debian/.cvsignore b/debian/.cvsignore
new file mode 100644
index 000000000..6d10dce74
--- /dev/null
+++ b/debian/.cvsignore
@@ -0,0 +1 @@
+changelog
diff --git a/debian/changelog.in b/debian/changelog.in
index 83fb3ed8a..cb282c088 100644
--- a/debian/changelog.in
+++ b/debian/changelog.in
@@ -1,4 +1,4 @@
-enlightenment (0.16.999.003-0cvs20050325) unstable; urgency=low
+enlightenment (@VERSION@-1) unstable; urgency=low
 
   * a CVS snapshot release.
 
diff --git a/debian/enlightenment.docs b/debian/enlightenment.docs
new file mode 100644
index 000000000..8afc43b42
--- /dev/null
+++ b/debian/enlightenment.docs
@@ -0,0 +1,4 @@
+README
+TODO
+NEWS
+AUTHORS