diff --git a/Makefile.in b/Makefile.in
index b9547d2e49..5dbbeb1d62 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1441,6 +1441,8 @@ PYTHON_DIST:
 	mkdir $(DISTDIR)/wxPython/demo/bmp_source
 	mkdir $(DISTDIR)/wxPython/demo/data
 	mkdir $(DISTDIR)/wxPython/demo/dllwidget
+	mkdir $(DISTDIR)/wxPython/distutils
+	mkdir $(DISTDIR)/wxPython/distutils/command
 	mkdir $(DISTDIR)/wxPython/src
 	mkdir $(DISTDIR)/wxPython/src/gtk
 	mkdir $(DISTDIR)/wxPython/scripts
@@ -1469,6 +1471,8 @@ PYTHON_DIST:
 	-cp $(WXDIR)/wxPython/demo/bitmaps/* $(DISTDIR)/wxPython/demo/bitmaps
 	-cp $(WXDIR)/wxPython/demo/bmp_source/* $(DISTDIR)/wxPython/demo/bmp_source
 	-cp $(WXDIR)/wxPython/demo/data/* $(DISTDIR)/wxPython/demo/data
+	-cp $(WXDIR)/wxPython/demo/distutils/*.py $(DISTDIR)/wxPython/distutils
+	-cp $(WXDIR)/wxPython/demo/distutils/command/*.py $(DISTDIR)/wxPython/distutils/command
 	-cp $(WXDIR)/wxPython/demo/dllwidget/Makefile $(DISTDIR)/wxPython/demo/dllwidget
 	-cp $(WXDIR)/wxPython/demo/dllwidget/test_* $(DISTDIR)/wxPython/demo/dllwidget
 	-cp $(WXDIR)/wxPython/scripts/* $(DISTDIR)/wxPython/scripts
diff --git a/debian/changelog b/debian/changelog
index 9a52eefd75..a56907878b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+wxwindows2.4 (2.4.0.3) unstable; urgency=low
+
+  * Changed Conflict to Replaces so people can use 2.4 -dev before all
+    their 2.3 deps are gone.  Closes: #178305
+  * Added wxPy supplied 2.3 distutils to the source package, apparently the
+    standard 2.2 one is now insufficient.  This hopefully Closes: #178457
+
+ -- Ron Lee <ron@debian.org>  Mon, 27 Jan 2003 17:36:59 -0800
+
 wxwindows2.4 (2.4.0.2) unstable; urgency=low
 
   * Added missing quantize.h to install.  Closes: #178135
diff --git a/debian/control.in b/debian/control.in
index 28ac6bb302..1a9da74f00 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -159,8 +159,8 @@ Description: wxWindows Cross-platform C++ GUI toolkit (development contrib libs)
 Package: wxwin=V-headers
 Architecture: any
 Section: devel
-Conflicts: wxwin-headers, libwxgtk2.3
-Replaces: wxwin-headers, wxgtk2.1-dev
+Conflicts: wxwin-headers
+Replaces: wxwin-headers, wxgtk2.1-dev, libwxgtk2.3
 Provides: wxwin-headers
 Description: wxWindows Cross-platform C++ GUI toolkit (header files)
  wxWindows is a class library for C++ providing GUI (Graphical User