diff --git a/debian/libmusic-dev.examples b/debian/libmusic-dev.examples
index b93e931befee20aca13f7e510692ad2b2c23a626..2bd4a57b601ffa7adf991402ddcc7e6a6a7ba9d1 100644
--- a/debian/libmusic-dev.examples
+++ b/debian/libmusic-dev.examples
@@ -1,5 +1,5 @@
-test/README
-test/*.cc
-test/*.music
-test/*.data
-test/*.dat
+examples/README
+examples/*.cc
+examples/*.music
+examples/*.data
+examples/*.dat
diff --git a/debian/rules b/debian/rules
index 42d915c28bd468088df71d40b2d06081ed1bdd71..d554037959f7d6435c4a94ade1b4dda1d7d9edd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,8 +10,8 @@ override_dh_auto_install:
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
 
 # Remove rpaths in libraries and binaries
-	( cd $(CURDIR)/debian/tmp/usr/lib/*; chrpath -d libmusic.so libmusic-c.so )
-	( cd $(CURDIR)/debian/tmp/usr/bin; chrpath -d eventcounter eventgenerator eventlogger eventselect eventsink eventsource music viewevents )
+	( cd $(CURDIR)/debian/tmp/usr/lib/$(DEB_TARGET_GNU_TYPE); chrpath -d libmusic.so libmusic-c.so )
+	( cd $(CURDIR)/debian/tmp/usr/bin; chrpath -d contsink eventcounter eventgenerator eventlogger eventselect eventsink eventsource messagesource music viewevents )
 
 # Build manual
 #	( cd $(CURDIR)/doc; make music-manual.pdf )
diff --git a/pymusic/Makefile.am b/pymusic/Makefile.am
index 4231039555ec2b22fdf08cd788dad0427d510dc3..6ec0b64865195bdef621de71c6ff9fd0598f4cbb 100644
--- a/pymusic/Makefile.am
+++ b/pymusic/Makefile.am
@@ -1,5 +1,7 @@
 
-EXTRA_DIST = setup.py.in tests.py pymusic.pyx pymusic.pxd pybuffer.pyx pybuffer.pxd 
+EXTRA_DIST = setup.py.in tests.py pymusic.pyx pymusic.pxd pybuffer.pyx pybuffer.pxd \
+             music/__init__.py music/music_c.h music/pybuffer.pxd music/pymusic.pxd \
+             music/pymusic_c.h mpi_compat.h
 
 BUILT_SOURCES = pymusic.cpp pybuffer.cpp