diff --git a/build.xml b/build.xml
index e16f9a695..17fd0f0d6 100644
--- a/build.xml
+++ b/build.xml
@@ -929,7 +929,7 @@
         bundle-growlnotification,bundle-swingnotification,bundle-galagonotification,
         bundle-sparkle, bundle-plugin-branding,
         bundle-systemactivitynotifications,
-        bundle-osdependent,bundle-browserlauncher,
+        bundle-osdependent,bundle-browserlauncher,bundle-systray-service,
         bundle-pluginmanager,bundle-skinmanager,
         bundle-notification-service,bundle-notification-handlers,
         bundle-notification-wiring,bundle-notification-config,
@@ -1855,6 +1855,17 @@ javax.swing.event, javax.swing.border"/>
         </jar>
     </target>
 
+    <!--BUNDLE-OSDEPENDENT-->
+    <target name="bundle-systray-service">
+        <!-- Creates a bundle for the systray service."-->
+        <jar
+            compress="false" destfile="${bundles.dest}/systray-service.jar"
+            manifest="${src}/net/java/sip/communicator/service/systray/systray.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/service/systray"
+                prefix="net/java/sip/communicator/service/systray"/>
+        </jar>
+    </target>
+
     <!-- BUNDLE-BROWSER LAUNCHER -->
     <target name="bundle-browserlauncher">
         <!-- Creates a bundle for the browser launcher.-->
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index aaab0e1c2..13c74d6a5 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -135,6 +135,7 @@ felix.auto.start.66= \
  reference:file:sc-bundles/swing-ui.jar \
  reference:file:sc-bundles/update.jar \
  reference:file:sc-bundles/swingnotification.jar \
+ reference:file:sc-bundles/systray-service.jar \
  reference:file:sc-bundles/osdependent.jar \
  reference:file:sc-bundles/ldap.jar \
  reference:file:sc-bundles/replacement.jar \
diff --git a/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf b/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
index 469d4b896..070cb564d 100644
--- a/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
+++ b/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
@@ -4,9 +4,7 @@ Bundle-Description: OS dependent.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
 System-Bundle: yes
-Export-Package: net.java.sip.communicator.service.systray,
- net.java.sip.communicator.service.systray.event,
- net.java.sip.communicator.service.desktop
+Export-Package: net.java.sip.communicator.service.desktop
 Import-Package: org.osgi.framework,
  org.jdesktop.jdic.desktop,
  org.jdesktop.jdic.tray,
diff --git a/src/net/java/sip/communicator/service/systray/systray.manifest.mf b/src/net/java/sip/communicator/service/systray/systray.manifest.mf
new file mode 100644
index 000000000..7ff6ff813
--- /dev/null
+++ b/src/net/java/sip/communicator/service/systray/systray.manifest.mf
@@ -0,0 +1,7 @@
+Bundle-Name: Systray service
+Bundle-Description: Systray service
+Bundle-Vendor: jitsi.org
+Bundle-Version: 0.0.1
+System-Bundle: yes
+Export-Package: net.java.sip.communicator.service.systray,
+ net.java.sip.communicator.service.systray.event