diff --git a/wxPython/distrib/wxPython.rsp b/wxPython/distrib/wxPython.rsp
index 29fd8841eb..fa67623606 100644
--- a/wxPython/distrib/wxPython.rsp
+++ b/wxPython/distrib/wxPython.rsp
@@ -11,6 +11,7 @@ demo/*.xml
 demo/data/*.png
 demo/data/*.htm
 demo/data/*.bmp
+demo/data/*.txt
 demo/data/*.i
 demo/data/*.h
 
diff --git a/wxPython/distrib/wxPython.spec b/wxPython/distrib/wxPython.spec
index 18a265ade8..7cdbfa9766 100644
--- a/wxPython/distrib/wxPython.spec
+++ b/wxPython/distrib/wxPython.spec
@@ -85,6 +85,7 @@ fi
 %{pref}/lib/python1.5/site-packages/wxPython/*.py
 %{pref}/lib/python1.5/site-packages/wxPython/*.py?
 %{pref}/lib/python1.5/site-packages/wxPython/lib
+%{pref}/lib/python1.5/site-packages/wxPython/demo
 %{pref}/lib/python1.5/site-packages/wxPython/wxcmodule.so
 %{pref}/lib/python1.5/site-packages/wxPython/oglcmodule.so
 %{pref}/lib/python1.5/site-packages/wxPython/stc_cmodule.so
diff --git a/wxPython/src/build.cfg b/wxPython/src/build.cfg
index af9b505dd6..03cb509abc 100644
--- a/wxPython/src/build.cfg
+++ b/wxPython/src/build.cfg
@@ -38,8 +38,8 @@ __version__.py: ../distrib/build.py  build.cfg
 
 else:
     DEFAULTRULE = 'default: $(GENCODEDIR) helperlib $(TARGET) $(BUILDDIR)/$(TARGET) bldpycfiles'
-    OTHERINSTALLTARGETS = 'installLib installHelpers '
-    OTHERUNINSTALLTARGETS = 'uninstallLib uninstallHelpers '
+    OTHERINSTALLTARGETS = 'installLib installDemo installHelpers '
+    OTHERUNINSTALLTARGETS = 'uninstallLib uninstallDemo uninstallHelpers '
 
     #OTHERLFLAGS = '-L. '
     OTHERRULES = """
@@ -83,11 +83,36 @@ installLib:
 	$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR); \\
 	$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR);
 
+installDemo:
+	mkdir $(TARGETDIR)/demo;            			\\
+	mkdir $(TARGETDIR)/demo/bitmaps;       			\\
+	mkdir $(TARGETDIR)/demo/data;          			\\
+	cp ../demo/*.py $(TARGETDIR)/demo;			\\
+	cp ../demo/*.xml $(TARGETDIR)/demo;			\\
+	cp ../demo/*.txt $(TARGETDIR)/demo;			\\
+	cp ../demo/bitmaps/*.bmp $(TARGETDIR)/demo/bitmaps;	\\
+	cp ../demo/bitmaps/*.ico $(TARGETDIR)/demo/bitmaps;	\\
+	cp ../demo/bitmaps/*.gif $(TARGETDIR)/demo/bitmaps;	\\
+	cp ../demo/bitmaps/*.png $(TARGETDIR)/demo/bitmaps;	\\
+	cp ../demo/bitmaps/*.jpg $(TARGETDIR)/demo/bitmaps;	\\
+	cp ../demo/data/*.png $(TARGETDIR)/demo/data;   	\\
+	cp ../demo/data/*.htm $(TARGETDIR)/demo/data;   	\\
+	cp ../demo/data/*.bmp $(TARGETDIR)/demo/data;   	\\
+	cp ../demo/data/*.txt $(TARGETDIR)/demo/data;   	\\
+	cp ../demo/data/*.i $(TARGETDIR)/demo/data;	   	\\
+	cp ../demo/data/*.h $(TARGETDIR)/demo/data;   		\\
+	$(EXECPREFIX)/bin/python $(PYLIB)/compileall.py $(TARGETDIR)/demo;\\
+	$(EXECPREFIX)/bin/python -O $(PYLIB)/compileall.py $(TARGETDIR)/demo;
+
+
 
 
 uninstallLib:
 	rm -rf $(TARGETDIR)/lib;
 
+uninstallDemo:
+	rm -rf $(TARGETDIR)/demo;
+
 
 uninstallHelpers:
 	rm -f $(HELPERLIBDIR)/lib$(HELPERLIB)$(SO)