diff --git a/debian/control b/debian/control
index 56adc4fc..60947faf 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,8 @@ Description: A collaborative content management system with voting features
 
 Package: glasnost-gtk
 Architecture: all
-Depends: glasnost (= ${Source-Version}), python-gtk2
+Conflicts: glasnost
+Depends: python-gtk2
 Description: A collaborative content management system with voting features
  Glasnost is the voting system originally developed by Easter-eggs for
  in-house decision making and now also used in other places.
diff --git a/debian/glasnost-gtk.files b/debian/glasnost-gtk.files
index d3135a00..e69de29b 100644
--- a/debian/glasnost-gtk.files
+++ b/debian/glasnost-gtk.files
@@ -1,2 +0,0 @@
-/usr/bin/glasnost-gtk
-/usr/lib/glasnost/glasnost/gtk
diff --git a/debian/rules b/debian/rules
index d84c41b5..bad35fd5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -73,11 +73,23 @@ install: build
 	find $(CURDIR)/debian/glasnost* -name .cvsignore -exec rm -f {} \;
 	find $(CURDIR)/debian/glasnost* -name '.*' -type f -exec rm -r {} \;
 	-find $(CURDIR)/debian/glasnost* -name CVS -type d -exec rm -rf {} \; 2> /dev/null
-	rm $(CURDIR)/debian/glasnost/usr/share/glasnost/glasnost-start
 	# this is ugly but python 2.1 didn't have xmlrpclib.py
 	-mkdir -p $(CURDIR)/debian/glasnost/usr/lib/python2.1/site-packages/
 	cp /usr/lib/python2.2/xmlrpclib.py $(CURDIR)/debian/glasnost/usr/lib/python2.1/site-packages/
 
+	cp -R $(CURDIR)/debian/glasnost/* $(CURDIR)/debian/glasnost-gtk/
+	rm -rf $(CURDIR)/debian/glasnost/usr/share/glasnost/glasnost/gtk/ \
+		$(CURDIR)/debian/glasnost/usr/bin/glasnost-gtk
+	
+	rm -rf $(CURDIR)/debian/glasnost-gtk/usr/lib/glasnost/glasnost/web/ \
+		$(CURDIR)/debian/glasnost-gtk/usr/lib/glasnost/glasnost/server/ \
+		$(CURDIR)/debian/glasnost-gtk/usr/lib/glasnost/glasnost/gcurses/ \
+		$(CURDIR)/debian/glasnost-gtk/usr/lib/glasnost/servers \
+		$(CURDIR)/debian/glasnost-gtk/usr/lib/glasnost/web \
+		$(CURDIR)/debian/glasnost-gtk/usr/share/glasnost/glasnost-ctl.py \
+		$(CURDIR)/debian/glasnost-gtk/usr/sbin \
+		$(CURDIR)/debian/glasnost-gtk/var \
+
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir