diff --git a/debian/changelog b/debian/changelog
index 553a0d0..d8f9bef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libcaca (0.4-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Build-depend on doxygen and tetex to build documentation.
+    + Build-depend on xlibs-dev and slang1-dev to provide alternate drivers.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Tue, 23 Dec 2003 18:01:41 +0100
+
 libcaca (0.3-2) unstable; urgency=low
 
   * debian/rules:
diff --git a/debian/control b/debian/control
index 514e4cb..80585ef 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: libcaca
 Section: libs
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), libncurses5-dev, libimlib2-dev
+Build-Depends: debhelper (>= 4.0), libncurses5-dev, slang1-dev, xlibs-dev, libimlib2-dev, doxygen, tetex-bin, tetex-extra
 Standards-Version: 3.6.1.0
 
 Package: libcaca-dev
diff --git a/debian/rules b/debian/rules
index 725e47c..72f0b3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ else
 endif
 
 confflags += --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+confflags += --enable-ncurses --enable-slang --enable-x11
 
 configure: configure-stamp
 configure-stamp:
@@ -37,7 +38,7 @@ install: build
 	dh_testroot
 	dh_clean -k
 	dh_installdirs -plibcaca-dev
-	dh_installdirs usr/bin usr/share/doc usr/share/man/man1 -pcaca-utils
+	dh_installdirs usr/bin usr/share/doc/caca-utils usr/share/man/man1 -pcaca-utils
 
 	DESTDIR=`pwd`/debian/libcaca-dev/ $(MAKE) install prefix=/usr
 
@@ -47,10 +48,21 @@ install: build
 	mv debian/libcaca-dev/usr/bin/caca-spritedit debian/caca-utils/usr/bin
 
 	mv debian/libcaca-dev/usr/share/libcaca debian/caca-utils/usr/share
-	mv debian/libcaca-dev/usr/share/man/man1/cacademo.1 debian/caca-utils/usr/share/man/man1
+	mv debian/libcaca-dev/usr/share/man/man1/cacademo.1 \
+	   debian/caca-utils/usr/share/man/man1
 	ln -s cacademo.1 debian/caca-utils/usr/share/man/man1/cacafire.1
-	mv debian/libcaca-dev/usr/share/man/man1/cacaview.1 debian/caca-utils/usr/share/man/man1
-	mv debian/libcaca-dev/usr/share/man/man1/caca-spritedit.1 debian/caca-utils/usr/share/man/man1
+	mv debian/libcaca-dev/usr/share/man/man1/cacaview.1 \
+	   debian/caca-utils/usr/share/man/man1
+	mv debian/libcaca-dev/usr/share/man/man1/caca-spritedit.1 \
+	   debian/caca-utils/usr/share/man/man1
+
+	cp debian/libcaca-dev/usr/share/doc/libcaca-dev/README \
+	   debian/libcaca-dev/usr/share/doc/libcaca-dev/BUGS \
+	   debian/libcaca-dev/usr/share/doc/libcaca-dev/TODO \
+	   debian/libcaca-dev/usr/share/doc/libcaca-dev/AUTHORS \
+	   debian/libcaca-dev/usr/share/doc/libcaca-dev/NEWS \
+	   debian/libcaca-dev/usr/share/doc/libcaca-dev/NOTES \
+	   debian/caca-utils/usr/share/doc/caca-utils/
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -62,8 +74,7 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 #	dh_installdebconf	
-	dh_installdocs README BUGS TODO AUTHORS NEWS NOTES -pcaca-utils
-	dh_installdocs README BUGS TODO AUTHORS NEWS NOTES -plibcaca-dev
+	dh_installdocs
 #	dh_installexamples
 	dh_installmenu
 #	dh_installemacsen