diff --git a/apps/dbus/Makefile.am b/apps/dbus/Makefile.am
index 4cb0852..f64811b 100644
--- a/apps/dbus/Makefile.am
+++ b/apps/dbus/Makefile.am
@@ -24,8 +24,8 @@
 if HAVE_DBUS_PYTHON
 
 dist_bin_SCRIPTS = \
-	presage_dbus_service \
-	presage_dbus_python_demo
+	presage_dbus_service
+
 
 python_PYTHON = \
 	presage_dbus_service.py
@@ -34,8 +34,7 @@ dbus_servicedir = $(datadir)/dbus-1/services
 dbus_service_DATA = org.gnome.presage.service
 
 EXTRA_DIST = \
-	org.gnome.presage.service.in \
-	presage_dbus_python_demo.in
+	org.gnome.presage.service.in
 
 org.gnome.presage.service:	org.gnome.presage.service.in Makefile
 	sed -e "s|{bindir}|$(bindir)|" $< > $@
@@ -46,15 +45,9 @@ if HAVE_HELP2MAN
 presage_dbus_service.1:	presage_dbus_service $(top_srcdir)/configure.ac
 	help2man --output=$@ --no-info --name="presage dbus service" $(srcdir)/presage_dbus_service
 
-presage_dbus_python_demo.1:	presage_dbus_python_demo $(top_srcdir)/configure.ac
-	chmod u+x ./presage_dbus_python_demo
-	help2man --output=$@ --no-info --name="presage dbus demo program" ./presage_dbus_python_demo
-
-dist_man_MANS =		presage_dbus_service.1 \
-			presage_dbus_python_demo.1
+dist_man_MANS =		presage_dbus_service.1
 
-DISTCLEANFILES =	presage_dbus_service.1 \
-			presage_dbus_python_demo.1
+DISTCLEANFILES =	presage_dbus_service.1
 endif
 
 endif
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 4bf3efd..168d938 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -27,14 +27,12 @@ if ENABLE_PYTHON_BINDING
 
 PRESAGE_INTERFACE =	../../src/lib/presage.h \
 			../../src/lib/presageException.h \
-			../../src/lib/presageCallback.h 
+			../../src/lib/presageCallback.h
 SWIG_INTERFACE =	../presage.i
 
 BUILT_SOURCES =		presage_wrap.cpp presage_wrap.h presage.py
 CLEANFILES =		presage_wrap.cpp presage_wrap.h presage.py
 
-EXTRA_DIST =	presage_python_demo
-
 all-local:	presage_wrap.cpp presage_wrap.h presage.py
 	@case "`uname`" in \
 	  MINGW*) \
@@ -75,7 +73,6 @@ uninstall-local:
 	rm -f $(DESTDIR)$(libdir)/python*/site-packages/presage.py
 	rm -f $(DESTDIR)$(libdir)/python*/site-packages/presage.pyc
 	rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_presage-*.egg-info
-	rm -f $(DESTDIR)$(bindir)/presage_python_demo
 
 clean-local:
 	rm -rf build
@@ -83,16 +80,6 @@ clean-local:
 presage_wrap.cpp presage_wrap.h presage.py:	$(SWIG_INTERFACE) $(PRESAGE_INTERFACE)
 	$(SWIG) -c++ -python -I$(top_srcdir)/src/lib -o presage_wrap.cpp -outdir . $(srcdir)/$(SWIG_INTERFACE)
 
-if HAVE_HELP2MAN
-presage_python_demo.1:	presage_python_demo.in $(top_srcdir)/configure.ac
-	chmod u+x ./presage_python_demo
-	help2man --output=$@ --no-info --name="presage demo program (Python)" "$(PYTHON) ./presage_python_demo"
-
-dist_man_MANS =		presage_python_demo.1
-
-DISTCLEANFILES =	presage_python_demo.1
-endif 
-
 endif # ENABLE_PYTHON_BINDING
 endif # HAVE_PYTHON
 endif # HAVE_SWIG