diff --git a/debian/control.in b/debian/control.in
index ed7bde3414..535ce2d60e 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -39,9 +39,25 @@ Description: wxBase library (development) - non-GUI support classes of wxWindows
  wxBase currently supports the following platforms: Win32, generic Unix
  (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
  .
- This package is only useful for non-gui apps.  It offers a subset of the
- classes in libwx_gtk=V for use in console apps and daemons.  It is currently
- under development and may not be as stable as the gui version.
+ This package provides the files needed to compile apps using the wxBase library.
+
+Package: libwxbase=V-dbg
+Architecture: any
+Section: devel
+Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
+Description: wxBase library (debug) - non-GUI support classes of wxWindows toolkit
+ wxBase is a collection of C++ classes providing basic data structures
+ (strings, lists, arrays), powerful wxDateTime class for date manipulations,
+ portable wrappers around many OS-specific functions allowing to build the
+ same program under all supported folders, wxThread class for writing
+ multithreaded programs using either Win32 or POSIX threads and much more.
+ wxBase currently supports the following platforms: Win32, generic Unix
+ (Linux, FreeBSD, Solaris, HP-UX, ...) and BeOS.
+ .
+ This package provides a debug version of the wxBase library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWindows itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
 
 Package: libwxgtk=V
 Architecture: any
@@ -74,6 +90,20 @@ Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
  want to compile apps using the (optional) glcanvas library you will need
  to have Mesa or OpenGL installed too.
 
+Package: libwxgtk=V-dbg
+Architecture: any
+Section: devel
+Depends: wxwin=V-headers (= ${Source-Version}), libc6-dev
+Description: wxWindows Cross-platform C++ GUI toolkit (GTK+ development)
+ wxWindows is a class library for C++ providing GUI (Graphical User
+ Interface) and other facilities on more than one platform.  Version =V
+ currently supports subsets of GTK+, Motif, and MS Windows.
+ .
+ This package provides a debug version of the wxGtk library.  It is compiled
+ both with -g for normal debugger tracing and with the __WXDEBUG__ flag which
+ provides many internal checks by wxWindows itself that are not performed on
+ apps compiled with the 'release version' libs in the -dev package.
+
 Package: libwxgtk=V-python
 Architecture: any
 Section: interpreters
@@ -86,7 +116,7 @@ Description: wxWindows Cross-platform C++ GUI toolkit (Python binding)
  .
  This package provides a Python binding to the wxGTK library.
 
-Package: wxwin=V-contrib
+Package: libwxgtk=V-contrib
 Architecture: any
 Section: libs
 Depends: libwxgtk=V (= ${Source-Version}), ${shlibs:Depends}
@@ -98,13 +128,13 @@ Description: wxWindows Cross-platform C++ GUI toolkit (runtime contrib libs)
  This package provides the contrib libs of the wxWindows source tree
  (mmedia, ogl, stc)
 
-Package: wxwin=V-contrib-dev
+Package: libwxgtk=V-contrib-dev
 Architecture: any
 Section: devel
 Depends: wxwin=V-headers (= ${Source-Version}), libwxgtk=V-dev (= ${Source-Version}), libc6-dev
-Conflicts: wxwin-contrib-dev
-Replaces: wxwin-contrib-dev
-Provides: wxwin-contrib-dev
+Conflicts: libwxgtk-contrib-dev
+Replaces: libwxgtk-contrib-dev
+Provides: libwxgtk-contrib-dev
 Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
  wxWindows is a class library for C++ providing GUI (Graphical User
  Interface) and other facilities on more than one platform.  Version =V
diff --git a/debian/libwxbase-dbg.dirs b/debian/libwxbase-dbg.dirs
new file mode 100644
index 0000000000..1bb9506799
--- /dev/null
+++ b/debian/libwxbase-dbg.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/wx/include/wx
+usr/share/man/man1
+
diff --git a/debian/wxwin-contrib-dev.docs b/debian/libwxbase-dbg.docs
similarity index 100%
rename from debian/wxwin-contrib-dev.docs
rename to debian/libwxbase-dbg.docs
diff --git a/debian/libwxbase-dbg.links b/debian/libwxbase-dbg.links
new file mode 100644
index 0000000000..124b341bbb
--- /dev/null
+++ b/debian/libwxbase-dbg.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxbased-config.1.gz
+
diff --git a/debian/libwxbase-dbg.postinst b/debian/libwxbase-dbg.postinst
new file mode 100644
index 0000000000..eac3f0a3a8
--- /dev/null
+++ b/debian/libwxbase-dbg.postinst
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxbased-config 50
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
diff --git a/debian/libwxbase-dbg.prerm b/debian/libwxbase-dbg.prerm
new file mode 100644
index 0000000000..c7dc094a7c
--- /dev/null
+++ b/debian/libwxbase-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxbased-config
+
+#DEBHELPER#
+
diff --git a/debian/wxwin-contrib-dev.dirs b/debian/libwxgtk-contrib-dev.dirs
similarity index 100%
rename from debian/wxwin-contrib-dev.dirs
rename to debian/libwxgtk-contrib-dev.dirs
diff --git a/debian/wxwin-contrib.docs b/debian/libwxgtk-contrib-dev.docs
similarity index 100%
rename from debian/wxwin-contrib.docs
rename to debian/libwxgtk-contrib-dev.docs
diff --git a/debian/wxwin-contrib-dev.files b/debian/libwxgtk-contrib-dev.files
similarity index 100%
rename from debian/wxwin-contrib-dev.files
rename to debian/libwxgtk-contrib-dev.files
diff --git a/debian/wxwin-contrib.dirs b/debian/libwxgtk-contrib.dirs
similarity index 100%
rename from debian/wxwin-contrib.dirs
rename to debian/libwxgtk-contrib.dirs
diff --git a/debian/libwxgtk-contrib.docs b/debian/libwxgtk-contrib.docs
new file mode 100644
index 0000000000..4c4d01649e
--- /dev/null
+++ b/debian/libwxgtk-contrib.docs
@@ -0,0 +1,2 @@
+docs/licence.txt
+
diff --git a/debian/wxwin-contrib.postinst b/debian/libwxgtk-contrib.postinst
similarity index 100%
rename from debian/wxwin-contrib.postinst
rename to debian/libwxgtk-contrib.postinst
diff --git a/debian/libwxgtk-dbg.dirs b/debian/libwxgtk-dbg.dirs
new file mode 100644
index 0000000000..4361f0cadd
--- /dev/null
+++ b/debian/libwxgtk-dbg.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib/wx/include/wx/gtkd/
+usr/share/man/man1
+
diff --git a/debian/libwxgtk-dbg.docs b/debian/libwxgtk-dbg.docs
new file mode 100644
index 0000000000..4c4d01649e
--- /dev/null
+++ b/debian/libwxgtk-dbg.docs
@@ -0,0 +1,2 @@
+docs/licence.txt
+
diff --git a/debian/libwxgtk-dbg.links b/debian/libwxgtk-dbg.links
new file mode 100644
index 0000000000..aa9cfe39cf
--- /dev/null
+++ b/debian/libwxgtk-dbg.links
@@ -0,0 +1,2 @@
+usr/share/man/man1/wx-config.1.gz usr/share/man/man1/wxgtkd-config.1.gz
+
diff --git a/debian/libwxgtk-dbg.postinst b/debian/libwxgtk-dbg.postinst
new file mode 100644
index 0000000000..a6eeacea7f
--- /dev/null
+++ b/debian/libwxgtk-dbg.postinst
@@ -0,0 +1,11 @@
+#! /bin/sh
+set -e
+
+update-alternatives --install /usr/bin/wx-config wx-config /usr/bin/wxgtkd-config 50
+
+if [ "$1" = "configure" ]; then
+	ldconfig
+fi
+
+#DEBHELPER#
+
diff --git a/debian/libwxgtk-dbg.prerm b/debian/libwxgtk-dbg.prerm
new file mode 100644
index 0000000000..db293a0055
--- /dev/null
+++ b/debian/libwxgtk-dbg.prerm
@@ -0,0 +1,7 @@
+#! /bin/sh
+set -e
+
+update-alternatives --remove wx-config /usr/bin/wxgtkd-config
+
+#DEBHELPER#
+
diff --git a/debian/rules b/debian/rules
index 9271ce05e5..df58c43300 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,8 +20,8 @@ package_gtk_lib=libwxgtk$(release)
 package_gtk_dev=libwxgtk$(release)-dev
 package_gtk_dbg=libwxgtk$(release)-dbg
 package_gtk_py=libwxgtk$(release)-python
-package_contrib=wxwin$(release)-contrib
-package_contrib_dev=wxwin$(release)-contrib-dev
+package_gtk_contrib=libwxgtk$(release)-contrib
+package_gtk_contrib_dev=libwxgtk$(release)-contrib-dev
 package_headers=wxwin$(release)-headers
 package_doc=wxwin$(release)-doc
 package_examples=wxwin$(release)-examples
@@ -29,22 +29,27 @@ package_examples=wxwin$(release)-examples
 # Build directories:
 objdir_wxbase_shared=objs_wxbase_sh
 objdir_wxbase_static=objs_wxbase_st
+objdir_wxbase_debug=objs_wxbase_d
 objdir_gtk_shared=objs_gtk_sh
 objdir_gtk_static=objs_gtk_st
+objdir_gtk_debug=objs_gtk_d
 objdir_doc_cruft=objs_doc_con
 objdir_doc=docs/wxWindows-manual.html
 objdir_examples=docs/examples
-objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_gtk_shared) \
-	$(objdir_gtk_static) $(objdir_doc) $(objdir_examples)
+objdirs=$(objdir_wxbase_shared) $(objdir_wxbase_static) $(objdir_wxbase_debug) \
+	$(objdir_gtk_shared) $(objdir_gtk_static) $(objdir_gtk_debug) \
+	$(objdir_doc) $(objdir_examples)
 
 build_stamps=build-wxbase-shared-stamp build-wxbase-static-stamp \
-             build-gtk-shared-stamp build-gtk-static-stamp \
+             build-wxbase-debug-stamp build-gtk-shared-stamp \
+             build-gtk-static-stamp build-gtk-debug-stamp \
              build-contrib-shared-stamp build-contrib-static-stamp \
              build-gtk-python-stamp build-examples-stamp build-doc-stamp
 
-install_all=install-wxbase-lib install-wxbase-dev install-gtk-lib \
-            install-gtk-dev install-gtk-contrib install-gtk-contrib-dev \
-            install-gtk-py install-headers install-doc install-examples
+install_all=install-wxbase-lib install-wxbase-dev install-wxbase-dbg \
+            install-gtk-lib install-gtk-dev install-gtk-dbg \
+            install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
+            install-headers install-doc install-examples
 
 wxconfig:=$(shell pwd)/$(objdir_gtk_shared)/wx-config \
 		--prefix=$(shell pwd) \
@@ -69,6 +74,10 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 		echo "generating control file $(package_wxbase_dev).$$f"; \
 		cp debian/libwxbase-dev.$$f debian/$(package_wxbase_dev).$$f; \
 	done;
+	@for f in dirs docs links postinst prerm; do \
+		echo "generating control file $(package_wxbase_dbg).$$f"; \
+		cp debian/libwxbase-dbg.$$f debian/$(package_wxbase_dbg).$$f; \
+	done;
 	@for f in dirs docs postinst; do \
 		echo "generating control file $(package_gtk_lib).$$f"; \
 		cp debian/libwxgtk.$$f debian/$(package_gtk_lib).$$f; \
@@ -77,17 +86,21 @@ control-files-stamp: debian/control debian/wxwin-doc.doc-base
 		echo "generating control file $(package_gtk_dev).$$f"; \
 		cp debian/libwxgtk-dev.$$f debian/$(package_gtk_dev).$$f; \
 	done;
+	@for f in dirs docs links postinst prerm; do \
+		echo "generating control file $(package_gtk_dbg).$$f"; \
+		cp debian/libwxgtk-dbg.$$f debian/$(package_gtk_dbg).$$f; \
+	done;
 	@for f in dirs docs files postinst prerm; do \
 		echo "generating control file $(package_gtk_py).$$f"; \
 		cp debian/libwxgtk-python.$$f debian/$(package_gtk_py).$$f; \
 	done;
 	@for f in dirs docs postinst; do \
-		echo "generating control file $(package_contrib).$$f"; \
-		cp debian/wxwin-contrib.$$f debian/$(package_contrib).$$f; \
+		echo "generating control file $(package_gtk_contrib).$$f"; \
+		cp debian/libwxgtk-contrib.$$f debian/$(package_gtk_contrib).$$f; \
 	done;
 	@for f in dirs docs files; do \
-		echo "generating control file $(package_contrib_dev).$$f"; \
-		cp debian/wxwin-contrib-dev.$$f debian/$(package_contrib_dev).$$f; \
+		echo "generating control file $(package_gtk_contrib_dev).$$f"; \
+		cp debian/libwxgtk-contrib-dev.$$f debian/$(package_gtk_contrib_dev).$$f; \
 	done;
 	@for f in dirs docs files; do \
 		echo "generating control file $(package_headers).$$f"; \
@@ -127,6 +140,18 @@ build-wxbase-static-stamp:
 		&& $(MAKE)
 	touch $@
 
+build-wxbase-debug-stamp:
+	dh_testdir
+	mkdir $(objdir_wxbase_debug)
+	cd $(objdir_wxbase_debug) \
+		&& ../configure --prefix=/usr \
+				--disable-gui \
+				--enable-debug \
+				--enable-burnt_name \
+				--with-zlib=sys \
+		&& $(MAKE)
+	touch $@
+
 build-gtk-shared-stamp:
 	dh_testdir
 	mkdir $(objdir_gtk_shared)
@@ -157,6 +182,22 @@ build-gtk-static-stamp:
 		&& $(MAKE)
 	touch $@
 
+build-gtk-debug-stamp:
+	dh_testdir
+	mkdir $(objdir_gtk_debug)
+	cd $(objdir_gtk_debug) \
+		&& ../configure --prefix=/usr \
+				--with-gtk \
+				--with-opengl \
+				--enable-debug \
+				--enable-burnt_name \
+				--with-zlib=sys \
+				--with-libjpeg=sys \
+				--with-libpng=sys \
+				--with-libtiff=sys \
+		&& $(MAKE)
+	touch $@
+
 build-contrib-shared-stamp: build-gtk-shared-stamp
 	dh_testdir
 	cd $(objdir_gtk_shared)/contrib/src && $(MAKE)
@@ -217,11 +258,13 @@ clean: debian/control
 	dh_clean
 	rm -f debian/$(package_wxbase_lib).*
 	rm -f debian/$(package_wxbase_dev).*
+	rm -f debian/$(package_wxbase_dbg).*
 	rm -f debian/$(package_gtk_lib).*
 	rm -f debian/$(package_gtk_dev).*
+	rm -f debian/$(package_gtk_dbg).*
 	rm -f debian/$(package_gtk_py).*
-	rm -f debian/$(package_contrib).*
-	rm -f debian/$(package_contrib_dev).*
+	rm -f debian/$(package_gtk_contrib).*
+	rm -f debian/$(package_gtk_contrib_dev).*
 	rm -f debian/$(package_headers).*
 	rm -f debian/$(package_doc).*
 	rm -f debian/$(package_examples).*
@@ -246,6 +289,15 @@ install-wxbase-dev: build-wxbase-static-stamp install-wxbase-lib
 	dh_movefiles --sourcedir=debian/$(package_wxbase_lib)
 	cp $(objdir_wxbase_static)/lib/*.a debian/$(package_wxbase_dev)/usr/lib
 
+install-wxbase-dbg: DH_OPTIONS=-p$(package_wxbase_dbg)
+install-wxbase-dbg: build-wxbase-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_wxbase_debug)/lib/* debian/$(package_wxbase_dbg)/usr/lib
+	cp $(objdir_wxbase_debug)/wxbased-config debian/$(package_wxbase_dbg)/usr/bin/
+
 install-gtk-lib: DH_OPTIONS=-p$(package_gtk_lib)
 install-gtk-lib: build-gtk-shared-stamp
 	dh_testdir
@@ -265,24 +317,33 @@ install-gtk-dev: build-gtk-static-stamp install-gtk-lib
 	dh_movefiles --sourcedir=debian/$(package_gtk_lib)
 	cp $(objdir_gtk_static)/lib/libwx_gtk*.a debian/$(package_gtk_dev)/usr/lib
 
-install-gtk-contrib: DH_OPTIONS=-p$(package_contrib)
+install-gtk-dbg: DH_OPTIONS=-p$(package_gtk_dbg)
+install-gtk-dbg: build-gtk-debug-stamp
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+	cp -a $(objdir_gtk_debug)/lib/* debian/$(package_gtk_dbg)/usr/lib
+	cp $(objdir_gtk_debug)/wxgtkd-config debian/$(package_gtk_dbg)/usr/bin/
+
+install-gtk-contrib: DH_OPTIONS=-p$(package_gtk_contrib)
 install-gtk-contrib: build-contrib-shared-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 	cd $(objdir_gtk_shared)/contrib/src \
-		&& $(MAKE) install prefix=`pwd`/../../../debian/$(package_contrib)/usr
+		&& $(MAKE) install prefix=`pwd`/../../../debian/$(package_gtk_contrib)/usr
 
-install-gtk-contrib-dev: DH_OPTIONS=-p$(package_contrib_dev)
+install-gtk-contrib-dev: DH_OPTIONS=-p$(package_gtk_contrib_dev)
 install-gtk-contrib-dev: build-contrib-static-stamp install-gtk-dev
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	dh_movefiles --sourcedir=debian/$(package_contrib)
-	cp $(objdir_gtk_static)/lib/*.a debian/$(package_contrib_dev)/usr/lib
-	rm -f debian/$(package_contrib_dev)/usr/lib/libwx_gtk*.a
+	dh_movefiles --sourcedir=debian/$(package_gtk_contrib)
+	cp $(objdir_gtk_static)/lib/*.a debian/$(package_gtk_contrib_dev)/usr/lib
+	rm -f debian/$(package_gtk_contrib_dev)/usr/lib/libwx_gtk*.a
 
 install-gtk-py: DH_OPTIONS=-p$(package_gtk_py)
 install-gtk-py: build-gtk-python-stamp
@@ -375,6 +436,9 @@ binary-gtk-dev: control-files-stamp install-gtk-dev install-headers
 	  DH_OPTIONS="-p$(package_gtk_lib) -p$(package_gtk_dev) -p$(package_headers)" \
 	  binary-common
 
+binary-gtk-dbg: control-files-stamp install-gtk-dbg install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_gtk_dbg) -p$(package_headers)" binary-common
+
 # libwxbase shared lib package
 binary-wxbase: control-files-stamp install-wxbase-lib install-headers
 	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_headers)" binary-common
@@ -384,14 +448,18 @@ binary-wxbase-dev: control-files-stamp install-wxbase-dev install-headers
 	  DH_OPTIONS="-p$(package_wxbase_lib) -p$(package_wxbase_dev) -p$(package_headers)" \
 	  binary-common
 
+binary-wxbase-dbg: control-files-stamp install-wxbase-dbg install-headers
+	$(MAKE) -f debian/rules DH_OPTIONS="-p$(package_wxbase_dbg) -p$(package_headers)" binary-common
+
 # docs package
 binary-doc: control-files-stamp install-doc
 	$(MAKE) -f debian/rules DH_OPTIONS=-p$(package_doc) binary-common
 
 
 .PHONY: build clean binary-indep binary-arch binary binary-common binary-gtk \
-        binary-gtk-dev binary-wxbase binary-wxbase-dev binary-doc install \
-	install-wxbase-lib install-wxbase-dev install-gtk-lib install-gtk-dev \
-	install-gtk-contrib install-gtk-contrib-dev install-gtk-py \
-	install-headers install-doc install-examples
+        binary-gtk-dev binary-gtk-dbg binary-wxbase binary-wxbase-dev \
+	binary-wxbase-dbg binary-doc install install-wxbase-lib \
+	install-wxbase-dev install-wxbase-dbg install-gtk-lib install-gtk-dev \
+	install-gtk-dbg install-gtk-contrib install-gtk-contrib-dev \
+	install-gtk-py install-headers install-doc install-examples