diff --git a/.gitignore b/.gitignore
index d9f69e7..022cd38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,9 +4,10 @@ obj-*
 debian/tmp/
 debian/*.debhelper
 debian/gir1.2-xapp-1.0/
-debian/libxapp-dbg/
 debian/libxapp-dev/
+debian/libxapp-gtk3-module/
 debian/libxapp1/
+debian/xapp-sn-watcher/
 debian/xapps-common/
 debian/xapps-doc/
 debian/*.log
diff --git a/debian/control b/debian/control
index 750ed10..9a9c19e 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,21 @@ Description: XApp library - development files
  This package provides the include files and static library for the XApp
  library functions.
 
+Package: libxapp-gtk3-module
+Section: libs
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends:
+ xapps-common (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks: libxapp1 (<< 2.4.2~)
+Replaces: libxapp1 (<< 2.4.2~)
+Description: GTK 3.0 module for the XApp library
+ This package contains a GTK 3.0 module to make features of the XApp library
+ available to GTK 3.0 applications.
+
 Package: libxapp1
 Section: libs
 Architecture: any
@@ -60,9 +75,24 @@ Depends:
  xapps-common (>= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends},
+Recommends:
+ libxapp-gtk3-module (= ${binary:Version}),
+ xapp-sn-watcher (= ${binary:Version}),
 Description: XApp library
  This library is used by several Xapp apps.
 
+Package: xapp-sn-watcher
+Architecture: any
+Depends:
+ default-dbus-session-bus | dbus-session-bus,
+ xapps-common (>= ${source:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+Breaks: libxapp1 (<< 2.4.2~), xapps-common (<< 2.4.2~)
+Replaces: libxapp1 (<< 2.4.2~), xapps-common (<< 2.4.2~)
+Description: D-Bus session bus service to support the XApp library
+ This package contains xapp-sn-watcher.
+
 Package: xapps-common
 Architecture: all
 Multi-Arch: foreign
diff --git a/debian/libxapp-gtk3-module.install b/debian/libxapp-gtk3-module.install
new file mode 100644
index 0000000..6cd86de
--- /dev/null
+++ b/debian/libxapp-gtk3-module.install
@@ -0,0 +1,2 @@
+etc/X11
+usr/lib/*/gtk-3.0/modules
diff --git a/debian/libxapp1.install b/debian/libxapp1.install
index 225be3c..8178aeb 100644
--- a/debian/libxapp1.install
+++ b/debian/libxapp1.install
@@ -1,4 +1 @@
 usr/lib/*/libxapp.so.*
-usr/libexec/xapps/sn-watcher/*
-usr/lib/*/gtk-3.0/modules
-etc/X11
diff --git a/debian/libxapp1.maintscript b/debian/libxapp1.maintscript
new file mode 100644
index 0000000..58b0fa5
--- /dev/null
+++ b/debian/libxapp1.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/X11/xinit/xinitrc.d/80xapp-gtk3-module.sh 2.4.2~
diff --git a/debian/xapp-sn-watcher.install b/debian/xapp-sn-watcher.install
new file mode 100644
index 0000000..a234802
--- /dev/null
+++ b/debian/xapp-sn-watcher.install
@@ -0,0 +1,3 @@
+etc/xdg/autostart
+usr/libexec/xapps/sn-watcher
+usr/share/dbus-1/services/org.x.StatusNotifierWatcher.service
diff --git a/debian/xapps-common.install b/debian/xapps-common.install
index 674ffc8..d63c899 100644
--- a/debian/xapps-common.install
+++ b/debian/xapps-common.install
@@ -4,5 +4,4 @@ usr/share/icons
 usr/share/locale
 usr/libexec/xapps/*.py
 usr/share/mate-panel/applets
-usr/share/dbus-1/services
-etc/xdg/autostart
\ No newline at end of file
+usr/share/dbus-1/services/org.mate.panel.applet.MateXAppStatusAppletFactory.service
diff --git a/debian/xapps-common.maintscript b/debian/xapps-common.maintscript
new file mode 100644
index 0000000..6c54a31
--- /dev/null
+++ b/debian/xapps-common.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/autostart/xapp-sn-watcher.desktop 2.4.2~