Replace System-Bundle header by BSN and a list that defines sys-bundles

61 files changed, 60 insertions, 61 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,