diff --git a/packages/debian/cc65.dirs b/packages/debian/cc65.dirs
index 72ab42586..fbb2b21a1 100644
--- a/packages/debian/cc65.dirs
+++ b/packages/debian/cc65.dirs
@@ -1,4 +1,8 @@
 usr/bin
 usr/lib/cc65/lib
 usr/lib/cc65/include/geos
+usr/lib/cc65/include/tgi
+usr/lib/cc65/asminc
+usr/lib/cc65/emd
+usr/lib/cc65/tgi
 usr/share/info
diff --git a/packages/debian/changelog b/packages/debian/changelog
index bbbbe96c2..b85fe18ae 100644
--- a/packages/debian/changelog
+++ b/packages/debian/changelog
@@ -1,3 +1,10 @@
+cc65 (2.9.0-1) stable; urgency=low
+
+  * New upstream version
+  * we're working in stable here
+
+ -- Michael Klein <michael.klein@puffin.lb.shuttle.de>  Sun, 19 Jan 2003 17:19:00 +0100
+
 cc65 (2.8.0-2) unstable; urgency=low
 
   * debian/control: Suggest target packages, don't recommend them
diff --git a/packages/debian/control b/packages/debian/control
index bea5ae6f8..b6f8ecf22 100644
--- a/packages/debian/control
+++ b/packages/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper, sgml-tools, perl
 Standards-Version: 3.2.1
 
 Package: cc65
-Suggests: cc65-apple2, cc65-atari, cc65-c128, cc65-c64, cc65-cbm510, cc65-cbm610, cc65-geos, cc65-pet, cc65-plus4
+Suggests: cc65-apple2, cc65-atari, cc65-c128, cc65-c64, cc65-cbm510, cc65-cbm610, cc65-geos, cc65-pet, cc65-plus4, cc65-c16, cc65-vic20
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Crosscompiler/Crossassembler for 6502 systems
@@ -82,3 +82,17 @@ Description: Plus/4 specific libraries and headers for the cc65 compiler
  programs for the Commodore Plus/4 and C16/116 using the cc65
  crosscompiler.
 
+Package: cc65-c16
+Architecture: all
+Depends: cc65 (= ${Source-Version})
+Description: C16/116 specific libraries and headers for the cc65 compiler
+ This package contains the header files and libraries needed to write
+ programs for the Commodore C16/116 using the cc65 crosscompiler.
+
+Package: cc65-vic20
+Architecture: all
+Depends: cc65 (= ${Source-Version})
+Description: VIC20 specific libraries and headers for the cc65 compiler
+ This package contains the header files and libraries needed to write
+ programs for the Commodore VIC20 using the cc65 crosscompiler.
+
diff --git a/packages/debian/rules b/packages/debian/rules
index 65787400b..826c0c58f 100644
--- a/packages/debian/rules
+++ b/packages/debian/rules
@@ -12,7 +12,7 @@ build-stamp:
 	# Add here commands to compile the package.
 	$(MAKE) -C src -f make/gcc.mak
 	$(MAKE) -C libsrc
-	$(MAKE) -C doc
+	$(MAKE) -C doc all
 
 	touch build-stamp
 
@@ -30,11 +30,24 @@ binary-indep: build
 	dh_testdir -i
 	dh_testroot -i
 	dh_installdirs -i
-	for arch in apple2 atari c128 c64 cbm510 cbm610 geos pet plus4; do \
-	  install -m0644 `pwd`/libsrc/$$arch.lib debian/cc65-$$arch/usr/lib/cc65/lib && \
-	  install -m0644 `pwd`/libsrc/$$arch.o debian/cc65-$$arch/usr/lib/cc65/lib; \
+	for arch in apple2 atari c128 c64 cbm510 cbm610 geos pet plus4 c16 vic20; do \
+	  install -m0755 -d debian/cc65-$$arch/usr/lib/cc65/lib; \
+	  install -m0644 `pwd`/libsrc/$$arch.lib debian/cc65-$$arch/usr/lib/cc65/lib/; \
+	  install -m0644 `pwd`/libsrc/$$arch.o debian/cc65-$$arch/usr/lib/cc65/lib/; \
+	  for f in `pwd`/libsrc/$$arch-*.emd; do \
+	    if [ -f $$f ]; then \
+	      install -m0755 -d debian/cc65-$$arch/usr/lib/cc65/emd; \
+	      install -m0644 $$f debian/cc65-$$arch/usr/lib/cc65/emd/;  \
+	    fi; \
+	  done; \
+	  for f in `pwd`/libsrc/$$arch-*.tgi; do \
+	    if [ -f $$f ]; then \
+	      install -m0755 -d debian/cc65-$$arch/usr/lib/cc65/tgi; \
+	      install -m0644 $$f debian/cc65-$$arch/usr/lib/cc65/tgi/;  \
+	    fi; \
+	  done; \
+	  dh_installdocs -p cc65-$$arch src/ld65/cfg/$$arch.cfg; \
 	done
-	dh_installdocs -i
 	dh_installchangelogs -i
 	dh_compress -i
 	dh_fixperms -i
@@ -57,6 +70,8 @@ binary-arch: checkroot build
 	done
 	install -m0644 `pwd`/include/*.h           debian/cc65/usr/lib/cc65/include
 	install -m0644 `pwd`/include/geos/*.h      debian/cc65/usr/lib/cc65/include/geos
+	install -m0644 `pwd`/include/tgi/*.h       debian/cc65/usr/lib/cc65/include/tgi
+	install -m0644 `pwd`/asminc/*.inc          debian/cc65/usr/lib/cc65/asminc
 	dh_installman -a
 	dh_installdocs -a
 	dh_installexamples -a