diff --git a/livesupport/etc/debian/livesupport-station.postinst b/livesupport/etc/debian/livesupport-station.postinst
index e144f3870..cdbe6d48c 100644
--- a/livesupport/etc/debian/livesupport-station.postinst
+++ b/livesupport/etc/debian/livesupport-station.postinst
@@ -29,6 +29,7 @@ case "$1" in
         # do post-installation configuration
         $installdir/bin/createDatabase.sh
         $installdir/bin/createOdbcDataSource.sh
+        $installdir/bin/createGstreamerRegistry.sh  --directory=$installdir
         # register and start the livesupport scheduler deamon
         update-rc.d livesupport-station defaults 92 || true
         if command -v invoke-rc.d >/dev/null 2>&1 ; then
diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules
index d8130c2e3..ea1cafc6b 100755
--- a/livesupport/etc/debian/rules
+++ b/livesupport/etc/debian/rules
@@ -77,9 +77,9 @@ install-arch:
 	mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport/bin
 	mkdir -p $(CURDIR)/debian/livesupport-libs/opt/livesupport/tmp
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/lib \
-	      $(CURDIR)/debian/livesupport-libs/opt/livesupport
+	          $(CURDIR)/debian/livesupport-libs/opt/livesupport
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gst-* \
-		  $(CURDIR)/debian/livesupport-libs/opt/livesupport/bin
+		      $(CURDIR)/debian/livesupport-libs/opt/livesupport/bin
 
 	# now separate the station (server) files into debian/livesupport-station
 	mkdir -p $(CURDIR)/debian/livesupport-station
@@ -93,21 +93,22 @@ install-arch:
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/createDatabase.sh \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/createOdbcDataSource.sh \
-		  $(CURDIR)/debian/livesupport-station/opt/livesupport/bin
+	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/createGstreamerRegistry.sh \
+		      $(CURDIR)/debian/livesupport-station/opt/livesupport/bin
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/etc/gtk* \
-		  $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
+		      $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/alib \
           $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/archiveServer \
           $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/getid3 \
           $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/htmlUI \
           $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageServer \
-          $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport
+              $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/cache \
-          $(CURDIR)/debian/livesupport-station/opt/livesupport/var
+              $(CURDIR)/debian/livesupport-station/opt/livesupport/var
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/apache \
-          $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
+              $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
 
 	# now separate the studio (client) files into debian/livesupport-studio
 	mkdir -p $(CURDIR)/debian/livesupport-studio
@@ -118,16 +119,16 @@ install-arch:
 	mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport.sh \
-		  $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin
+		      $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/gLiveSupport.xml* \
-          $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc
+              $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/Widgets \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/gLiveSupport*.res \
 		  $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/livesupport.png \
-		$(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport
+		      $(CURDIR)/debian/livesupport-studio/opt/livesupport/var/LiveSupport
 	mkdir -p $(CURDIR)/debian/livesupport-studio/usr/share/applications
 	cp -a $(CURDIR)/debian/livesupport-studio.desktop \
-		$(CURDIR)/debian/livesupport-studio/usr/share/applications/
+		      $(CURDIR)/debian/livesupport-studio/usr/share/applications/
 	dh_desktop -plivesupport-studio    
 	dh_installmenu