138 files changed, 152 insertions, 140 deletions

diff --git a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
index bc6ee14..d5cdc7e 100644
--- a/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
+++ b/src/net/java/sip/communicator/impl/argdelegation/argdelegation.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Argument Delegation
 Bundle-Description: A bundle that delegates invocation arguments to register handler services
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.argdelegation
 Import-Package: org.osgi.framework,
  com.apple.eawt,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
index 0b225ba..c093bcf 100644
--- a/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
+++ b/src/net/java/sip/communicator/impl/browserlauncher/browserlauncher.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Browser Launcher
 Bundle-Description: An implementation of the BrowserLauncher service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.browserlauncher
 Export-Package: net.java.sip.communicator.service.browserlauncher
 Import-Package: org.osgi.framework,
  org.jitsi.util,
diff --git a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
index bb33b1b..b18ddb5 100644
--- a/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/callhistory/callhistory.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Call History Service Provider
 Bundle-Description: A bundle that implements the call history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.callhistory
 Import-Package: org.osgi.framework,
  org.jitsi.service.fileaccess,
  net.java.sip.communicator.service.history,
diff --git a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
index 981e58a..e92a12f 100644
--- a/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
+++ b/src/net/java/sip/communicator/impl/certificate/certificate.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Certificate Verification Activator
 Bundle-Description: A bundle that offers certificate verification
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.certificate
 Export-Package: net.java.sip.communicator.service.certificate
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf b/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
index 4edee12..08273ce 100644
--- a/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
+++ b/src/net/java/sip/communicator/impl/configuration/configuration.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Configuration Service Implementation
 Bundle-Description: A bundle that offers configuration utilities
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.configuration
 Import-Package: org.jitsi.service.configuration,
  org.jitsi.service.libjitsi,
  org.jitsi.util,
diff --git a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
index c40cd31..ef07f7e 100644
--- a/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/contactlist/meta.cl.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: MetaContactList
 Bundle-Description: An implementation of the MetaContactList service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.contactlist
 Import-Package: org.osgi.framework,
  org.jitsi.service.fileaccess,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf b/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
index a7281f9..daa341f 100644
--- a/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
+++ b/src/net/java/sip/communicator/impl/credentialsstorage/credentialsstorage.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Credentials Storage Service Implementation
 Bundle-Description: A bundle that handles credentials
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.credentialsstorage
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/impl/dns/dns.manifest.mf b/src/net/java/sip/communicator/impl/dns/dns.manifest.mf
index f4281d1..3dfb100 100644
--- a/src/net/java/sip/communicator/impl/dns/dns.manifest.mf
+++ b/src/net/java/sip/communicator/impl/dns/dns.manifest.mf
@@ -4,7 +4,6 @@ Bundle-SymbolicName: net.java.sip.communicator.impl.dns
 Bundle-Description: A bundle that export packages with DNS utility classes.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

 Import-Package: org.jitsi.util, 

  org.osgi.framework,

  net.java.sip.communicator.util,

diff --git a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
index 79805b1..77e31a5 100644
--- a/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
+++ b/src/net/java/sip/communicator/impl/fileaccess/fileaccess.manifest.mf
@@ -6,4 +6,4 @@ Bundle-Version: 0.0.1
 Import-Package: org.jitsi.service.fileaccess,
  org.jitsi.service.libjitsi,
  org.osgi.framework
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.fileaccess
diff --git a/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf b/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
index 9932f18..c9f8d2b 100644
--- a/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/filehistory/filehistory.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: File History Service Provider
 Bundle-Description: A bundle that implements the file history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.filehistory
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.records,
diff --git a/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf b/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
index 7c68a94..5757eff 100644
--- a/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/galagonotification/galagonotification.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Desktop Notifications Provider
 Bundle-Description: A bundle which implements notifications according to the freedesktop.org Desktop Notifications spec.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.galagonotification
 Import-Package: javax.imageio,
  net.java.sip.communicator.service.systray,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf b/src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf
index 91c101e..557b980 100644
--- a/src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf
+++ b/src/net/java/sip/communicator/impl/globaldisplaydetails/globaldisplaydetails.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Description: A bundle that implements the global display details package.
 Bundle-Name: Global Display Details Service Provider
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.globaldisplaydetails
 Import-Package: org.jitsi.service.resources,
  org.jitsi.service.configuration,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
index 16bd25e..47b4a89 100644
--- a/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
+++ b/src/net/java/sip/communicator/impl/globalshortcut/globalshortcut.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Global shortcut
 Bundle-Description: A bundle which implements global shortcut
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.globalshortcut
 Import-Package: org.osgi.framework,
  org.jitsi.util,
  net.java.sip.communicator.service.protocol,
diff --git a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
index 9940d11..e4cfcc9 100644
--- a/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/impl/googlecontacts/googlecontacts.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Google Contacts Service Implementation
 Bundle-Description: A bundle that offers access to Google Contacts
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.googlecontacts
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.credentialsstorage,
diff --git a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
index 291ffef..818b82c 100644
--- a/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/growlnotification/growlnotification.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Growl Notification Service Provider
 Bundle-Description: A bundle which implements Growl notifications.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.growlnotification
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.util,
diff --git a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
index 38041b9..c3dd91c 100644
--- a/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
+++ b/src/net/java/sip/communicator/impl/gui/swing.ui.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: UI Service Provider Implementation
 Bundle-Description: An implementation of the UI service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.swingui
 Import-Package: com.apple.eawt,
  com.sun.jna.platform,
  javax.accessibility,
diff --git a/src/net/java/sip/communicator/impl/hid/hid.manifest.mf b/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
index 17e50f2..63ed29f 100644
--- a/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
+++ b/src/net/java/sip/communicator/impl/hid/hid.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: HID Service Implementation
 Bundle-Description: A bundle that offers Human Interaction features.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.hid
 Import-Package: org.osgi.framework,
  org.jitsi.util,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/impl/history/history.manifest.mf b/src/net/java/sip/communicator/impl/history/history.manifest.mf
index e15631b..9d9cb8a 100644
--- a/src/net/java/sip/communicator/impl/history/history.manifest.mf
+++ b/src/net/java/sip/communicator/impl/history/history.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: History Service Provider
 Bundle-Description: A bundle that implements the history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.history
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.fileaccess,
diff --git a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
index 716b666..6db3a5b 100644
--- a/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
+++ b/src/net/java/sip/communicator/impl/keybindings/keybindings.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Keybindings
 Bundle-Description: Provides management and persistence of keyboard shortcuts.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.keybindings
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  org.jitsi.service.fileaccess,
diff --git a/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf b/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
index e3bda27..d5fdc71 100644
--- a/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/impl/ldap/ldap.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: LDAP service provider
 Bundle-Description: A bundle that implements LDAP service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.ldap
 Import-Package: org.osgi.framework,
  javax.naming,
  javax.naming.directory,
diff --git a/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf b/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf
index b8a48ea..17ee242 100644
--- a/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf
+++ b/src/net/java/sip/communicator/impl/libjitsi/libjitsi.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Description: The core of Jitsi as a stand-alone library
 Bundle-Name: libjitsi
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.libjitsi
 Export-Package: javax.media,
  javax.media.protocol,
  org.jitsi.impl.neomedia,
@@ -86,4 +87,3 @@ Import-Package: apple.awt,
  quicktime.std.image,
  quicktime.std.sg,
  quicktime.util
-System-Bundle: yes
diff --git a/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf b/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
index 0466886..0154c23 100644
--- a/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/metahistory/metahistory.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Meta History Service Provider
 Bundle-Description: A bundle that implements the meta history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.metahistory
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.history,
  net.java.sip.communicator.service.history.event,
diff --git a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
index e6379ed..5dc707e 100644
--- a/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
+++ b/src/net/java/sip/communicator/impl/msghistory/msghistory.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Message History Service Provider
 Bundle-Description: A bundle that implements the message history package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.msghistory
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/impl/muc/muc.manifest.mf b/src/net/java/sip/communicator/impl/muc/muc.manifest.mf
index 0cc32e0..853ab6b 100644
--- a/src/net/java/sip/communicator/impl/muc/muc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/muc/muc.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Chat room contact source
 Bundle-Description: Chat room contact source
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.muc
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactsource,
  net.java.sip.communicator.service.protocol,
diff --git a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
index e42a59a..ed0d1ac 100644
--- a/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
+++ b/src/net/java/sip/communicator/impl/neomedia/neomedia.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Neomedia Service Implementation
 Bundle-Description: A bundle that offers Media capture and presentation capabilities.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.neomedia
 Import-Package: apple.awt,
  ch.imvs.sdes4j,
  ch.imvs.sdes4j.srtp,
diff --git a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
index 9b181f2..048ba57 100644
--- a/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
+++ b/src/net/java/sip/communicator/impl/netaddr/netaddr.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Network Address Management service
 Bundle-Description: A bundle that provides local address selection and negotiation via ice4j.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.netaddr
 Import-Package: org.jitsi.service.configuration,
  org.jitsi.service.packetlogging,
  org.jitsi.util,
diff --git a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
index bf3dfa4..aad2dd6 100644
--- a/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/notification/notification.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Notifications
 Bundle-Description: An implementation of the Notification service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.notification
 Import-Package: org.osgi.framework,
  javax.imageio,
  org.jitsi.util,
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 daeb045..0db99ad 100644
--- a/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
+++ b/src/net/java/sip/communicator/impl/osdependent/osdependent.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: OS dependent
 Bundle-Description: OS dependent.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.osdependent

 Export-Package: net.java.sip.communicator.service.desktop

 Import-Package: org.osgi.framework,

  com.apple.cocoa.application,

diff --git a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
index fd88bab..374294f 100644
--- a/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
+++ b/src/net/java/sip/communicator/impl/packetlogging/packetlogging.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Packet Logging service
 Bundle-Description: A bundle that provides packet logging in pcap file format
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.packetlogging
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.fileaccess,
diff --git a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
index eb4be9a..d764657 100644
--- a/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/dict/dict.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Dict Protocol Provider
 Bundle-Description: A bundle providing support for the Dict protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.dict
 Import-Package: org.osgi.framework,
  org.jitsi.service.version,
  net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
index df54989..4505860 100644
--- a/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/gibberish/gibberish.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Gibberish Protocol Provider
 Bundle-Description: A bundle providing support for the Gibberish protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.gibberish
 Import-Package: org.osgi.framework,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
index 6dcb407..da47277 100644
--- a/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/icq/icq.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: ICQ Protocol Provider Implementation
 Bundle-Description: An ICQ/AIM implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.icq
 Import-Package: org.osgi.framework,
  javax.net,
  sun.misc,
diff --git a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
index 42b4a10..b7ef354 100644
--- a/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/irc/irc.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Irc Protocol Provider
 Bundle-Description: A bundle providing support for the Irc protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.irc
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
index c4a1696..e10bee2 100644
--- a/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/jabber/jabber.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Jabber Protocol Provider Implementation
 Bundle-Description: An Jabber implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.jabber
 Import-Package: ch.imvs.sdes4j.srtp,
  javax.net,
  javax.net.ssl,
diff --git a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
index 99f3451..49f52f7 100644
--- a/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/mock/mock.provider.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Name: MockProvider
 Bundle-Description: Mock provider service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.mock
 Import-Package: net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
  org.osgi.framework,
diff --git a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
index e366d17..d07b4f1 100644
--- a/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/msn/msn.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Msn Protocol Provider Implementation
 Bundle-Description: An Msn implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.msn
 Import-Package: org.apache.commons.logging,
  org.apache.http,
  org.apache.http.entity,
diff --git a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
index 508ec35..b318209 100644
--- a/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/rss/rss.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Rss Protocol Provider
 Bundle-Description: A bundle providing support for the Rss protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.rss
 Import-Package: org.osgi.framework,
  org.apache.log4j,
  org.xml.sax,
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
index 6866495..a929a45 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/sip/sip.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: SIP Communicator SIP Protocol Provider
 Bundle-Description: A bundle that implements the Protocol Provider package over SIP.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.sip
 Import-Package:  ch.imvs.sdes4j.srtp,
  javax.net,
  javax.net.ssl,
diff --git a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
index 07cd5e1..eb9472f 100644
--- a/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/ssh/ssh.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: SSH Protocol Provider
 Bundle-Description: A bundle providing support for the SSH protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.ssh
 Import-Package: org.osgi.framework,
  javax.crypto,
  javax.crypto.interfaces,
diff --git a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
index 35adf58..39e23bf 100644
--- a/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/yahoo/yahoo.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Yahoo Protocol Provider Implementation
 Bundle-Description: An Yahoo implementation of the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.yahoo
 Import-Package: org.osgi.framework,
  javax.net.ssl,
  javax.swing,
diff --git a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
index b6b0a70..24daba0 100644
--- a/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
+++ b/src/net/java/sip/communicator/impl/protocol/zeroconf/zeroconf.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Zeroconf Protocol Provider
 Bundle-Description: A bundle providing support for the Zeroconf protocol.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.protocol.zeroconf
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf b/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
index aeb4691..b1e7254 100644
--- a/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/provdisc/dhcp/dhcp.provdisc.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: DHCP provisioning discovery
 Bundle-Description: A bundle providing support for DHCP provisioning discovery
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.provdisc.dhcp
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.provdisc,
  net.java.sip.communicator.service.provdisc.event,
diff --git a/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf b/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
index 6b5a3c9..1d82086 100644
--- a/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/impl/provdisc/mdns/mdns.provdisc.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: mDNS provisioning discovery
 Bundle-Description: A bundle providing support for mDNS provisioning discovery
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.provdisc.mdns
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.provdisc,
  net.java.sip.communicator.service.provdisc.event,
diff --git a/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
index bc6022d..96d05ee 100644
--- a/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/bliptv/bliptv.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Blip.tv Preview Replacement Source
 Bundle-Description: A bundle providing processing for Blip.tv previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.bliptv
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
index b48159b..f948958 100644
--- a/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/dailymotion/dailymotion.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Dailymotion Replacement Source
 Bundle-Description: A bundle providing replacement for dailymotion links.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.dailymotion
 Import-Package: org.osgi.framework,
  org.jitsi.service.version,
  net.java.sip.communicator.service.replacement,
diff --git a/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
index ddf3016..2b6e976 100644
--- a/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/directimage/directimage.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Direct Image Link Replacement Source
 Bundle-Description: A bundle providing replacement for direct image links.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.directimage
 Import-Package: org.osgi.framework,
  org.jitsi.service.version,
  net.java.sip.communicator.service.replacement,
diff --git a/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
index 700e2c6..2317edc 100644
--- a/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/flickr/flickr.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Flickr Preview Replacement Source
 Bundle-Description: A bundle providing processing for flickr previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.flickr
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
index e7e91f7..13204dc 100644
--- a/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/hulu/hulu.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Hulu Preview Replacement Source
 Bundle-Description: A bundle providing processing for Hulu previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.hulu
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
index 02a2a1b..835c03f 100644
--- a/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/metacafe/metacafe.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Metacafe Preview Replacement Source
 Bundle-Description: A bundle providing processing for metacafe previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.metacafe
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
index c02d7a1..628e585 100644
--- a/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/smiley/smiley.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Smiley Replacement Source
 Bundle-Description: A bundle providing processing for smileys.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.smiley
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  net.java.sip.communicator.service.replacement.smilies,
diff --git a/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
index e34d774..3b2b1d3 100644
--- a/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/twitpic/twitpic.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Twitpic Preview Replacement Source
 Bundle-Description: A bundle providing processing for Twitpic previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.twitpic
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
index 53705dd..d7da965 100644
--- a/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/vbox7/vbox7.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Vbox7 Preview Replacement Source
 Bundle-Description: A bundle providing processing for vbox7 previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.vbox7
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
index 94859a9..a932de3 100644
--- a/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/viddler/viddler.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Viddler Preview Replacement Source
 Bundle-Description: A bundle providing processing for Viddler previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.viddler
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
index b9865e1..dee1b9a 100644
--- a/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/vimeo/vimeo.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Vimeo Preview Replacement Source
 Bundle-Description: A bundle providing processing for vimeo previews.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.vimeo
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf b/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
index 622cc39..63ae195 100644
--- a/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
+++ b/src/net/java/sip/communicator/impl/replacement/youtube/youtube.source.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Youtube Replacement Source
 Bundle-Description: A bundle providing replacement for youtube links.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 1.0.0
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.replacement.youtube
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.replacement,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
index 95ac100..3621568 100644
--- a/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
+++ b/src/net/java/sip/communicator/impl/resources/resourcemanagement.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Resource Management Service
 Bundle-Description: The plugin managing images and languages resource packs.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.resources
 Export-Package: net.java.sip.communicator.service.resources
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf b/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
index a0f1a1d..b366f19 100644
--- a/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
+++ b/src/net/java/sip/communicator/impl/shutdowntimeout/shutdown.timeout.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: ShutdownBundle
 Bundle-Description: A bundle that makes sure that when closed SIP Communicator will exit in 15 seconds at most.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.shutdowntimeout
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
index 72b68f0..7e36046 100644
--- a/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sparkle/sparkle.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Sparkle Auto-Update Service Provider
 Bundle-Description: A bundle that launches the Sparkle framework.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.sparkle
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf b/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
index 6033deb..5235ca9 100644
--- a/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
+++ b/src/net/java/sip/communicator/impl/swingnotification/swingnotification.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Swing Notification Service Provider
 Bundle-Description: A bundle which implements Swing notifications.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.swingnotification

 Import-Package: org.osgi.framework,

  org.jitsi.service.configuration,

  net.java.sip.communicator.service.protocol,

diff --git a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
index 3785a26..3f3044c 100644
--- a/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/sysactivity/sysactivity.impl.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: System Activity Service Implementation
 Bundle-Description: System Activity Service Implementation.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.sysactivity

 Import-Package: org.osgi.framework,

  org.jitsi.service.version,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf b/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
index a526ab9..f2c85a7 100755
--- a/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
+++ b/src/net/java/sip/communicator/impl/version/version.impl.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Version Service Implementation
 Bundle-Description: Version Service Implementation.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.version
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.version,
diff --git a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
index fca236b..b3f447e 100644
--- a/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/accountinfo/accountinfo.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Contact Info
 Bundle-Description: A plug-in that can set cross protocol account info.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.accountinfo

 Import-Package: org.osgi.framework,

   net.java.sip.communicator.service.gui,

   net.java.sip.communicator.service.globaldisplaydetails,

diff --git a/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf b/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
index 47b6cc1..615b813 100644
--- a/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/addrbook/addrbook.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Description: OS-specific Address Book support
 Bundle-Name: OS-specific Address Book support

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

+Bundle-SymbolicName: net.java.sip.communicator.plugin.addrbook

 Import-Package: javax.swing,

  org.jitsi.service.configuration,

  org.jitsi.util,

@@ -13,4 +14,3 @@ Import-Package: javax.swing,
  net.java.sip.communicator.util,
  net.java.sip.communicator.plugin.desktoputil,

  org.osgi.framework

-System-Bundle: yes

diff --git a/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf b/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
index b6e84bb..de50baf 100644
--- a/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/advancedconfig/advancedconfig.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Advanced config plugin
 Bundle-Description: The plugin offering advanced configuration page.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.advancedconfig
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
index 956d6c1..274310a 100644
--- a/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/aimaccregwizz/aimaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: AIM account registration wizard
 Bundle-Description: AIM account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.aimaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
index 73f314f..27383be 100755
--- a/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/branding/branding.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Branding plugin
 Bundle-Description: Branding plugin.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.branding
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf b/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
index 58ca8f4..c939c0a 100644
--- a/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/certconfig/certconfig.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Certificate Configuration Plugin
 Bundle-Description: Allows the configuration of general X.509 certificate settings.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: no
+Bundle-SymbolicName: net.java.sip.communicator.plugin.certconfig
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.certificate,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
index dae5365..565a0fc 100644
--- a/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatalerter/chatalerter.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Chat Alerter
 Bundle-Description: A plug-in that alerts for new messages by flashing the window in the taskbar.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.chatalerter

 Import-Package: org.osgi.framework,

  org.jitsi.util,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf b/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
index a503b1c..becd037 100644
--- a/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/chatconfig/chatconfig.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Plugin Manager Chat
 Bundle-Description: Manage all chat options.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.chatconfig
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
index 9e5a9e2..3a6f730 100644
--- a/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactinfo/contactinfo.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Contact Info
 Bundle-Description: A plug-in that can show cross protocol user info.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.contactinfo

 Import-Package: org.osgi.framework,

   net.java.sip.communicator.service.browserlauncher,

   net.java.sip.communicator.service.contactlist,

diff --git a/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf b/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
index e60f6bd..e3b21a6 100644
--- a/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/contactsourceconfig/contactsourceconfig.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Description: Contact sources configuration
 Bundle-Name: Contact sources configuration
 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

+Bundle-SymbolicName: net.java.sip.communicator.plugin.contactsourceconfig

 Import-Package: net.java.sip.communicator.service.contactsource,

  net.java.sip.communicator.service.protocol,

  net.java.sip.communicator.util,
@@ -12,4 +13,3 @@ Import-Package: net.java.sip.communicator.service.contactsource,
  org.jitsi.service.configuration,

  org.osgi.framework,
  javax.swing

-System-Bundle: yes

diff --git a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
index 467bf88..13f63c9 100644
--- a/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/defaultresourcepack/defaultresourcepack.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Default Resource Pack
 Bundle-Description: The plugin offering default images and languages.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.defaultresourcepack
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources
diff --git a/src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf b/src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf
index aeb9023..e5161cc 100644
--- a/src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/demuxcontactsource/demuxcontactsource.manifest.mf
@@ -2,9 +2,9 @@ Bundle-Activator: net.java.sip.communicator.plugin.demuxcontactsource.DemuxConta
 Bundle-Description: Demultiplexing contact source
 Bundle-Name: Demux Contact Source
 Bundle-Vendor: jitsi.org

-Bundle-Version: 0.0.1

+Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.demuxcontactsource

 Import-Package: net.java.sip.communicator.service.contactsource,
  net.java.sip.communicator.service.protocol,
  org.jitsi.util,
  org.osgi.framework

-System-Bundle: yes

diff --git a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
index f6fd16c..f1512cd 100644
--- a/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/desktoputil/desktoputil.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Jitsi Swing Utility Packages
 Bundle-Description: A bundle that export packages with swing related utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.desktoputil
 Import-Package: com.sun.awt,
  javax.accessibility,
  javax.imageio,
diff --git a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
index a6e842a..02dc2c4 100644
--- a/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dictaccregwizz/dictaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Dict account registration wizard
 Bundle-Description: Dict account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.dictaccregwizz
 Import-Package: org.osgi.framework,
  net.java.dict4j,
  net.java.sip.communicator.service.browserlauncher,
diff --git a/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf b/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
index 12f5052..1e99edb 100644
--- a/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/dnsconfig/dnsconfig.manifest.mf
@@ -1,10 +1,9 @@
 Bundle-Activator: net.java.sip.communicator.plugin.dnsconfig.DnsConfigActivator
 Bundle-Name: Jitsi DNS config
-Bundle-SymbolicName: net.java.sip.communicator.plugin
 Bundle-Description: A bundle that export config panels for DNS utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.dnsconfig
 Import-Package: org.jitsi.util, 
  org.osgi.framework,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
index 87ac64f..f2fbf2c 100644
--- a/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/exampleplugin/exampleplugin.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Example plugin
 Bundle-Description: An example showing how to make plugins for the ui.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.exampleplugin
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
diff --git a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
index 603ce0a..9c79947 100644
--- a/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/facebookaccregwizz/facebookaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Facebook account registration wizard
 Bundle-Description: Facebook account registration wizard.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.facebookaccregwizz

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.service.browserlauncher,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
index 5aa2084..fce5592 100644
--- a/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/generalconfig/generalconfig.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: General config plugin
 Bundle-Description: The plugin offering general configuration page.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.generalconfig
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.util,
diff --git a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
index 501cedc..547d61f 100644
--- a/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/gibberishaccregwizz/gibberishaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Gibberish account registration wizard
 Bundle-Description: Gibberish account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.gibberishaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
index 9e1cc68..ec39037 100644
--- a/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/globalproxyconfig/globalproxyconfig.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Global Proxy Config Plugin
 Bundle-Description: A plugin to configure global proxy for sip communicator

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.globalproxyconfig

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.util,

  net.java.sip.communicator.plugin.desktoputil,

diff --git a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
index 5860531..7fa1500 100644
--- a/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/googletalkaccregwizz/googletalkaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Google Talk account registration wizard
 Bundle-Description: Google Talk account registration wizard.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.googletalkaccregwizz

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.service.browserlauncher,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
index 1a85969..0cc4564 100644
--- a/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/icqaccregwizz/icqaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: ICQ account registration wizard
 Bundle-Description: ICQ account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.icqaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
index c08d731..10be2ad 100644
--- a/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ippiaccregwizz/ippiaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Ippi account registration wizard
 Bundle-Description: Ippi account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.ippiaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
index 847a9f1..348b81d 100644
--- a/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/iptelaccregwizz/iptelaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: IP Tel account registration wizard
 Bundle-Description: IP Tel account registration wizard.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.iptelaccregwizz

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.service.browserlauncher,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
index e773cc6..ff96fe3 100644
--- a/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ircaccregwizz/ircaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: IRC account registration wizard
 Bundle-Description: IRC account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.ircaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
index 08f5aa2..2ad0e96 100755
--- a/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/jabberaccregwizz/jabberaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Jabber account registration wizard
 Bundle-Description: Jabber account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.jabberaccregwizz
 Export-package: net.java.sip.communicator.plugin.jabberaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
diff --git a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
index 1ff1759..f7cb167 100644
--- a/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/keybindingchooser/keybindingChooser.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Keybinding Chooser
 Bundle-Description: Provides configuring UI for keyboard shortcuts.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.keybindingchooser
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.gui,
  net.java.sip.communicator.service.keybindings,
diff --git a/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf b/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
index d45fa03..131d6fe 100644
--- a/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/ldap/ldap.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Description: LDAP support
 Bundle-Name: LDAP support
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.ldap
 Import-Package: net.java.sip.communicator.service.contactsource,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.service.protocol,
@@ -18,4 +19,3 @@ Import-Package: net.java.sip.communicator.service.contactsource,
  javax.swing.tree,
  javax.swing.text,
  org.osgi.framework
-System-Bundle: yes
diff --git a/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf b/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
index 8d57c13..0117300 100644
--- a/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/loggingutils/loggingutils.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Logging utils
 Bundle-Description: A bundle that provides packet logging utils as config and saving archived logs
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.loggingutils
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.fileaccess,
diff --git a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
index 7f6f8b8..fc6599a 100755
--- a/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msnaccregwizz/msnaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Msn account registration wizard
 Bundle-Description: Msn account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.msnaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
index 427d704..a395536 100644
--- a/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/msofficecomm/msofficecomm.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Description: Microsoft Office Communicator
 Bundle-Name: Microsoft Office Communicator
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.msofficecomm
 Import-Package: javax.swing,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
index da86327..2eae88c 100644
--- a/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/nimbuzzavatars/nimbuzzavatars.manifest.mf
@@ -3,6 +3,6 @@ Bundle-Name: NimbuzzAvatars
 Bundle-Description: Custom Nimbuzz Avatars plugin
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.nimbuzzavatars
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.customavatar
diff --git a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
index 62bc3e6..40a3410 100644
--- a/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationconfiguration/notificationconfiguration.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Plugin Manager Notification
 Bundle-Description: Manage all SIP Communicator notification.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.notificationconfiguration
 Import-Package: 
  javax.accessibility,
  javax.imageio,
diff --git a/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf b/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
index 5335d88..6e7582a 100644
--- a/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/notificationwiring/notificationwiring.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Notification-Wiring
 Bundle-Description: Wires events from various bundles to the notification service
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.notificationwiring
 Import-Package: javax.imageio,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf b/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf
index 71c607c..73f917a 100644
--- a/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/otr/otr.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: OTR (Off-the-Record) Messaging
 Bundle-Description: Support for secure, Off The Record messaging in SIP Communicator

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.otr

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.service.browserlauncher,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf b/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf
index 4dce74f..450df1d 100644
--- a/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/phonenumbercontactsource/phonenumbercontactsource.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Phone number contact source
 Bundle-Description: Phone number contact source
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.phonenumbercontactsource
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactsource,
  net.java.sip.communicator.service.protocol,
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
index 8773035..b29ff4e 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/PluginManagerActivator.java
@@ -43,6 +43,17 @@ public class PluginManagerActivator
         = "net.java.sip.communicator.plugin.pluginconfig.DISABLED";
 
     /**
+     * Name of the property that defines which bundles are considered system.
+     */
+    private static final String SYSTEM_BUNDLES_PROP
+        = "net.java.sip.communicator.plugin.pluginmanager.SYSTEM_BUNDLES";
+
+    /**
+     * Cache for the system bundles config property.
+     */
+    private static List<String> systemBundleNames;
+
+    /**
      * Starts this bundle and adds the
      * <td>PluginManagerConfigForm</tt> contained in it to the configuration
      * window obtained from the <tt>UIService</tt>.
@@ -64,13 +75,16 @@ public class PluginManagerActivator
             bundleContext.registerService(
                 ConfigurationForm.class.getName(),
                 new LazyConfigurationForm(
-                    "net.java.sip.communicator.plugin.pluginmanager.PluginManagerPanel",
+                    PluginManagerPanel.class.getName(),
                     getClass().getClassLoader(),
                     "plugin.pluginmanager.PLUGIN_ICON",
                     "plugin.pluginmanager.PLUGINS",
                     1000, true),
                 properties);
         }
+
+        systemBundleNames = Arrays.asList(getConfigurationService()
+            .getString(SYSTEM_BUNDLES_PROP).split(","));
     }
 
     /**
@@ -142,9 +156,7 @@ public class PluginManagerActivator
             return true;
         }
 
-        Object sysBundleProp = bundle.getHeaders().get("System-Bundle");
-
         //ignore if this is a system bundle
-        return (sysBundleProp != null && sysBundleProp.equals("yes"));
+        return systemBundleNames.contains(bundle.getSymbolicName());
     }
 }
diff --git a/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf b/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
index 0aa72b4..3c6a732 100644
--- a/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/pluginmanager/pluginmanager.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Plugin Manager plugin
 Bundle-Description: Manage all SIP Communicator plugins.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.pluginmanager
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
index c956cc6..9e3ebf4 100644
--- a/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/profiler4j/profiler4j.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Integrated profiler plugin
 Bundle-Description: A bundle that provides profile cpu and memory of the running app.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.profiler4j
 Import-Package: org.apache.commons.logging,
   org.osgi.framework,
   org.xml.sax,
diff --git a/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf b/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf
index 0d66769..3cee6ee 100644
--- a/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/propertieseditor/propertieseditor.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Properties Editor
 Bundle-Description: A panel that allows users to configure properties
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.propertieseditor
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.resources,
diff --git a/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf b/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf
index b123762..82824a4 100644
--- a/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/provisioning/provisioning.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Provisioning plugin
 Bundle-Description: Provisioning
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.provisioning
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf b/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf
index c4877df..004f93c 100644
--- a/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/reconnectplugin/reconnectplugin.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: ReconnectPlugin
 Bundle-Description: A bundle that implements the Reconnect Plugin Package.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.reconnectplugin
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.netaddr,
  net.java.sip.communicator.service.netaddr.event,
diff --git a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
index 9acedd6..16686a8 100644
--- a/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/rssaccregwizz/rssaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Rss account registration wizard
 Bundle-Description: Rss account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.rssaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf b/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf
index 784e47a..ae15b90 100644
--- a/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/securityconfig/securityconfig.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Security Configuration Form
 Bundle-Description: The configuration form for security
 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.securityconfig
 Import-Package: org.osgi.framework,

  org.jitsi.service.configuration,
  net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
index 669759e..b17b9ce 100644
--- a/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/simpleaccreg/simpleaccreg.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Simple account registration form
 Bundle-Description: Simple account registration form.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.simpleaccreg
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
index c583368..7ebbd1c 100644
--- a/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sip2sipaccregwizz/sip2sipaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Sip 2 Sip account registration wizard
 Bundle-Description: Sip 2 Sip account registration wizard.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

+Bundle-SymbolicName: net.java.sip.communicator.plugin.sip2sipaccregwizz

 Import-Package: org.osgi.framework,

  net.java.sip.communicator.service.browserlauncher,

  org.jitsi.service.configuration,

diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
index c7f83db..040c11a 100644
--- a/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/sipaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: SIP account registration wizard
 Bundle-Description: SIP account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.sipaccregwizz
 Export-package: net.java.sip.communicator.plugin.sipaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
diff --git a/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf b/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
index 423dfd4..36e598d 100644
--- a/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/skinmanager/skinmanager.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Skin Manager plugin
 Bundle-Description: Manage all SIP Communicator skins.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.skinmanager
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.gui,
diff --git a/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf b/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
index dd07b2c..1dc0072 100644
--- a/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/skinresourcepack/skinresourcepack.manifest.mf
@@ -4,7 +4,7 @@ Bundle-Name: Skin Resource Pack
 Bundle-Description: The plugin offering skin related data.
 Bundle-Vendor: jitsi.org, Adam Netocny, CircleTech, s.r.o.
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.skinresourcepack
 Import-Package: org.osgi.framework,
  org.jitsi.service.resources, net.java.sip.communicator.service.resources,
  net.java.sip.communicator.util
diff --git a/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf b/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf
index f03e786..851d3a1 100644
--- a/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/spellcheck/spellCheck.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Name: Spell Checker
 Bundle-Description: Provides interactive spell checking of messages being composed.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.plugin.spellcheck
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  org.jitsi.util,
diff --git a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
index 6f8b5f9..c48b853 100644
--- a/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/sshaccregwizz/sshaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: SSH account registration wizard
 Bundle-Description: SSH account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.sshaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/thunderbird/thunderbird.manifest.mf b/src/net/java/sip/communicator/plugin/thunderbird/thunderbird.manifest.mf
index eb308b5..f88f95b 100644
--- a/src/net/java/sip/communicator/plugin/thunderbird/thunderbird.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/thunderbird/thunderbird.manifest.mf
@@ -3,6 +3,7 @@ Bundle-Description: Thunderbird address source
 Bundle-Name: thunderbird

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

+Bundle-SymbolicName: net.java.sip.communicator.plugin.thunderbird

 Import-Package: javax.swing,

  javax.swing.event,

  javax.swing.text,

@@ -17,4 +18,3 @@ Import-Package: javax.swing,
  net.java.sip.communicator.plugin.desktoputil,

  org.osgi.framework,

  mork

-System-Bundle: no

diff --git a/src/net/java/sip/communicator/plugin/update/update.manifest.mf b/src/net/java/sip/communicator/plugin/update/update.manifest.mf
index 3de434b..b8c09dd 100644
--- a/src/net/java/sip/communicator/plugin/update/update.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/update/update.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Description: Checks for software updates, downloads and applies them
 Bundle-Name: Update
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.update
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  org.jitsi.service.resources,
diff --git a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
index 9f22dd5..1949650 100644
--- a/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/whiteboard/whiteboard.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Whiteboard plugin
 Bundle-Description: A whiteboard for SIP-Communicator.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.whiteboard
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.contactlist,
  net.java.sip.communicator.service.contactlist.event,
diff --git a/src/net/java/sip/communicator/plugin/windowscleanshutdown/cleanshutdown.manifest.mf b/src/net/java/sip/communicator/plugin/windowscleanshutdown/cleanshutdown.manifest.mf
index 25db59f..079ebdf 100644
--- a/src/net/java/sip/communicator/plugin/windowscleanshutdown/cleanshutdown.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/windowscleanshutdown/cleanshutdown.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: CleanShutdownBundle
 Bundle-Description: A bundle that makes sure that when closed Jitsi will exit cleanly.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.windowscleanshutdown
 Import-Package: org.osgi.framework,
  org.jitsi.service.configuration,
  net.java.sip.communicator.service.shutdown,
diff --git a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
index 9a283ab..a975e2e 100644
--- a/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/yahooaccregwizz/yahooaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Yahoo account registration wizard
 Bundle-Description: Yahoo account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.yahooaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
index 3ff6dd5..57a863b 100644
--- a/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
+++ b/src/net/java/sip/communicator/plugin/zeroconfaccregwizz/zeroconfaccregwizz.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Zeroconf account registration wizard
 Bundle-Description: Zeroconf account registration wizard.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.plugin.zeroconfaccregwizz
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.browserlauncher,
  org.jitsi.service.configuration,
diff --git a/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf b/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf
index 9888dd8..d1ac1a8 100644
--- a/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf
+++ b/src/net/java/sip/communicator/service/argdelegation/argdelegation.manifest.mf
@@ -2,5 +2,5 @@ Bundle-Name: Argument Delegation Service
 Bundle-Description: A service that allows bundles to register as handlers for specific command line arguments
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.argdelegation
 Export-Package: net.java.sip.communicator.service.argdelegation
diff --git a/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf b/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf
index 281912d..c3de6ba 100644
--- a/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf
+++ b/src/net/java/sip/communicator/service/contacteventhandler/contact.event.handler.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Name: Contact Event Handler service
 Bundle-Description: Contact Event Handler service
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.contacteventhandler
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol
 Export-Package: net.java.sip.communicator.service.contacteventhandler
diff --git a/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf b/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf
index 065d055..0a4c76a 100755
--- a/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf
+++ b/src/net/java/sip/communicator/service/contactlist/contactlist.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Name: Contactlist Service Interfaces
 Bundle-Description: Contactlist Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.contactlist
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.service.protocol
 Export-Package: net.java.sip.communicator.service.contactlist,
diff --git a/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf b/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
index 39a7991..e70e32c 100644
--- a/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
+++ b/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Name: Contact Source Service Interfaces
 Bundle-Description: ContactSource Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.contactsource
 Import-Package: org.osgi.framework,
  net.java.sip.communicator.util,
  net.java.sip.communicator.service.protocol,
diff --git a/src/net/java/sip/communicator/service/customavatar/customavatar.manifest.mf b/src/net/java/sip/communicator/service/customavatar/customavatar.manifest.mf
index 0d39921..54282d9 100644
--- a/src/net/java/sip/communicator/service/customavatar/customavatar.manifest.mf
+++ b/src/net/java/sip/communicator/service/customavatar/customavatar.manifest.mf
@@ -2,5 +2,5 @@ Bundle-Name: Custom Avatar Service
 Bundle-Description: A bundle that offers custom avatar retrieving.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.customavatar
 Export-Package: net.java.sip.communicator.service.customavatar
diff --git a/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf b/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf
index 71d0a01..e553655 100644
--- a/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf
+++ b/src/net/java/sip/communicator/service/customcontactactions/customcontactactions.manifest.mf
@@ -2,6 +2,6 @@ Bundle-Name: Custom Contact Actions
 Bundle-Description: Custom Contact Actions
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.customcontactactions
 Import-Package: net.java.sip.communicator.service.protocol
 Export-Package: net.java.sip.communicator.service.customcontactactions
diff --git a/src/net/java/sip/communicator/service/dns/dns.manifest.mf b/src/net/java/sip/communicator/service/dns/dns.manifest.mf
index fd3a869..8c332d0 100644
--- a/src/net/java/sip/communicator/service/dns/dns.manifest.mf
+++ b/src/net/java/sip/communicator/service/dns/dns.manifest.mf
@@ -3,6 +3,5 @@ Bundle-SymbolicName: net.java.sip.communicator.service.dns
 Bundle-Description: A bundle that export packages with DNS utility classes.

 Bundle-Vendor: jitsi.org

 Bundle-Version: 0.0.1

-System-Bundle: yes

 Import-Package: org.xbill.DNS

 Export-Package: net.java.sip.communicator.service.dns

diff --git a/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf b/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf
index 74dde8d..b0285f8 100644
--- a/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf
+++ b/src/net/java/sip/communicator/service/googlecontacts/googlecontacts.manifest.mf
@@ -2,5 +2,5 @@ Bundle-Name: Google Contacts Service
 Bundle-Description: A service accessing Google Contacts
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.googlecontacts
 Export-Package: net.java.sip.communicator.service.googlecontacts
diff --git a/src/net/java/sip/communicator/service/gui/gui.manifest.mf b/src/net/java/sip/communicator/service/gui/gui.manifest.mf
index 5bbfcbc..8327648 100644
--- a/src/net/java/sip/communicator/service/gui/gui.manifest.mf
+++ b/src/net/java/sip/communicator/service/gui/gui.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: UI Service
 Bundle-Description:  The User Interface Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.gui
 Import-Package: org.osgi.framework,
  org.jitsi.service.resources,
  net.java.sip.communicator.service.resources,
diff --git a/src/net/java/sip/communicator/service/hid/hid.manifest.mf b/src/net/java/sip/communicator/service/hid/hid.manifest.mf
index 98ed346..e48eeac 100644
--- a/src/net/java/sip/communicator/service/hid/hid.manifest.mf
+++ b/src/net/java/sip/communicator/service/hid/hid.manifest.mf
@@ -2,5 +2,5 @@ Bundle-Name: HID Service
 Bundle-Description: A bundle that offers Human Interaction service features.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.hid
 Export-Package: net.java.sip.communicator.service.hid
diff --git a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
index 435c0f9..338f7a1 100644
--- a/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
+++ b/src/net/java/sip/communicator/service/httputil/httputil.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Jitsi Http Utility Packages
 Bundle-Description: A bundle that export packages with http utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.httputil
 Import-Package: org.xml.sax, 
  org.w3c.dom,
  org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf b/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf
index 4007ce8..6a0a56c 100644
--- a/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf
+++ b/src/net/java/sip/communicator/service/ldap/ldap.manifest.mf
@@ -2,6 +2,7 @@ Bundle-Name: LDAP Service Implementation
 Bundle-Description: LDAP Service Implementation.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
+Bundle-SymbolicName: net.java.sip.communicator.service.ldap
 Import-Package: org.osgi.framework,
  javax.naming.directory,
  org.jitsi.service.configuration
diff --git a/src/net/java/sip/communicator/service/notification/notification.manifest.mf b/src/net/java/sip/communicator/service/notification/notification.manifest.mf
index 76b85ed..61facad 100644
--- a/src/net/java/sip/communicator/service/notification/notification.manifest.mf
+++ b/src/net/java/sip/communicator/service/notification/notification.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Notifications
 Bundle-Description: An implementation of the Notification service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.notification
 Export-Package: net.java.sip.communicator.service.notification,
  net.java.sip.communicator.service.notification.event
 Import-Package: org.osgi.framework,
diff --git a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
index 9ecfd1d..f3875c5 100644
--- a/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
+++ b/src/net/java/sip/communicator/service/protocol/media/protocol.media.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Media Utilities for the Protocol Provider Service
 Bundle-Description: Media Utilities for the Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.protocol.media
 Import-Package: javax.xml.parsers,
  javax.xml.transform,
  javax.xml.transform.dom,
diff --git a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
index 93a931c..9643133 100644
--- a/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
+++ b/src/net/java/sip/communicator/service/protocol/protocol.provider.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Protocol Provider Service
 Bundle-Description: Protocol Provider Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.protocol
 Import-Package: net.java.sip.communicator.service.credentialsstorage,
  net.java.sip.communicator.service.resources,
  net.java.sip.communicator.util,
diff --git a/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf b/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf
index ac539c0..766e76d 100644
--- a/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf
+++ b/src/net/java/sip/communicator/service/provdisc/provdisc.manifest.mf
@@ -2,6 +2,6 @@ Bundle-Name: Provisioning Discovery Service
 Bundle-Description: Provisioning Discovery Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.provdisc
 Export-Package: net.java.sip.communicator.service.provdisc,
  net.java.sip.communicator.service.provdisc.event
diff --git a/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf b/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf
index c7be7ca..22cfe12 100644
--- a/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf
+++ b/src/net/java/sip/communicator/service/replacement/replacement.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Name: Replacement Service
 Bundle-Description: Replacement Service.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.replacement
 Export-Package: net.java.sip.communicator.service.replacement,
  net.java.sip.communicator.service.replacement.smilies,
  net.java.sip.communicator.service.replacement.directimage
diff --git a/src/net/java/sip/communicator/service/systray/systray.manifest.mf b/src/net/java/sip/communicator/service/systray/systray.manifest.mf
index 5a8c657..63d1fb3 100644
--- a/src/net/java/sip/communicator/service/systray/systray.manifest.mf
+++ b/src/net/java/sip/communicator/service/systray/systray.manifest.mf
@@ -2,7 +2,7 @@ Bundle-Name: Systray service
 Bundle-Description: Systray service
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.systray
 Import-Package: net.java.sip.communicator.util,
  org.jitsi.service.configuration,
  org.osgi.framework
diff --git a/src/net/java/sip/communicator/service/update/update.manifest.mf b/src/net/java/sip/communicator/service/update/update.manifest.mf
index 0065856..a3b2101 100644
--- a/src/net/java/sip/communicator/service/update/update.manifest.mf
+++ b/src/net/java/sip/communicator/service/update/update.manifest.mf
@@ -2,5 +2,5 @@ Bundle-Description: Checks for software updates
 Bundle-Name: Update Service
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.update
 Export-Package: net.java.sip.communicator.service.update
diff --git a/src/net/java/sip/communicator/util/util.manifest.mf b/src/net/java/sip/communicator/util/util.manifest.mf
index 5dc7cd5..7de9af7 100644
--- a/src/net/java/sip/communicator/util/util.manifest.mf
+++ b/src/net/java/sip/communicator/util/util.manifest.mf
@@ -3,7 +3,7 @@ Bundle-Name: Jitsi Utility Packages
 Bundle-Description: A bundle that export packages with utility classes.
 Bundle-Vendor: jitsi.org
 Bundle-Version: 0.0.1
-System-Bundle: yes
+Bundle-SymbolicName: net.java.sip.communicator.service.util
 Import-Package: com.sun.awt,
  javax.imageio,
  javax.naming,