diff --git a/build.xml b/build.xml
index 4bce59f1f..b3d568dcf 100644
--- a/build.xml
+++ b/build.xml
@@ -894,7 +894,8 @@
         bundle-argdelegation,bundle-zrtp4j,
         bundle-filehistory,bundle-metahistory,bundle-metahistory-slick,
         bundle-plugin-facebookaccregwizz,
-        bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz"/>
+        bundle-bouncycastle,bundle-plugin-otr,bundle-plugin-iptelaccregwizz,
+        bundle-contactsource"/>
 
     <!--BUNDLE-SC-LAUNCHER-->
     <target name="bundle-sc-launcher">
@@ -2289,4 +2290,13 @@ org.apache.http.util"/>
         </jar>
     </target>
 
+    <!-- BUNDLE-PROTOCOL -->
+    <target name="bundle-contactsource">
+        <!-- Creates a bundle containing the contact source interfaces.-->
+        <jar compress="false" destfile="${bundles.dest}/contactsource.jar"
+            manifest="${src}/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf">
+            <zipfileset dir="${dest}/net/java/sip/communicator/service/contactsource"
+                prefix="net/java/sip/communicator/service/contactsource"/>
+        </jar>
+    </target>
 </project>
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 102d43a74..0939e70e0 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -92,7 +92,8 @@ felix.auto.start.60= \
  reference:file:sc-bundles/metahistory.jar \
  reference:file:sc-bundles/audionotifier.jar \
  reference:file:sc-bundles/keybindings.jar \
- reference:file:sc-bundles/notification.jar
+ reference:file:sc-bundles/notification.jar \
+ reference:file:sc-bundles/contactsource.jar
 
 felix.auto.start.66= \
  reference:file:sc-bundles/swing-ui.jar \
diff --git a/src/net/java/sip/communicator/service/contactsource/ContactDetail.java b/src/net/java/sip/communicator/service/contactsource/ContactDetail.java
index a4e68683c..1985a7f33 100644
--- a/src/net/java/sip/communicator/service/contactsource/ContactDetail.java
+++ b/src/net/java/sip/communicator/service/contactsource/ContactDetail.java
@@ -117,7 +117,7 @@ public String getContactAddress()
      * the given <tt>opSetClass</tt>
      */
     public ProtocolProviderService getPreferredProtocolProvider(
-        Class<OperationSet> opSetClass)
+        Class<? extends OperationSet> opSetClass)
     {
         return preferredProviders.get(opSetClass);
     }
diff --git a/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf b/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
new file mode 100644
index 000000000..acc02d35e
--- /dev/null
+++ b/src/net/java/sip/communicator/service/contactsource/contactsource.manifest.mf
@@ -0,0 +1,7 @@
+Bundle-Name: Contact Source Service Interfaces 
+Bundle-Description: ContactSource Service.
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+System-Bundle: yes
+Import-Package: org.osgi.framework
+Export-Package: net.java.sip.communicator.service.contactsource