diff --git a/build.xml b/build.xml
index 7fc314126..b24965b18 100644
--- a/build.xml
+++ b/build.xml
@@ -622,7 +622,7 @@
         bundle-ssh,bundle-plugin-sshaccregwizz,
         bundle-contacteventhandler,bundle-plugin-contactinfo,
         bundle-plugin-accountinfo,bundle-plugin-chatalerter,
-        bundle-plugin-statusupdate,
+        bundle-plugin-statusupdate,bundle-jfontchooserlib,
         bundle-updatecheckplugin,
         bundle-dict,bundle-plugin-dictaccregwizz,
         bundle-plugin-simpleaccreg,bundle-plugin-generalconfig,
@@ -1611,5 +1611,14 @@ javax.swing.event, javax.swing.border"/>
             <zipfileset dir="${dest}/net/java/sip/communicator/plugin/notificationconfiguration"
                 prefix="net/java/sip/communicator/plugin/notificationconfiguration"/>
         </jar>
+	</target>
+
+
+    <target name="bundle-jfontchooserlib">
+        <!-- Creates a bundle containing the jfontchooser lib.-->
+        <jar compress="false" destfile="${bundles.dest}/jfontchooserlib.jar"
+            manifest="${lib.noinst}/jfontchooser.manifest.mf">
+			<zipfileset src="${lib.noinst}/jfontchooser-1.0.5.jar" prefix=""/>
+        </jar>
     </target>
 </project>
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index df056b64b..ec1fe6f1c 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -41,8 +41,7 @@ org.osgi.framework.system.packages= org.osgi.framework; ; version=1.3.0, \
  org.xml.sax.helpers; \
  javax.crypto; \
  javax.crypto.spec; \
- javax.crypto.interfaces; \
- say.swing;
+ javax.crypto.interfaces;
 
 felix.auto.start.10= reference:file:lib/bundle/org.apache.felix.bundlerepository-1.0.0.jar \
  reference:file:lib/bundle/org.apache.felix.servicebinder-0.9.0-SNAPSHOT.jar
@@ -63,6 +62,7 @@ felix.auto.start.30= \
 felix.auto.start.40= \
  reference:file:sc-bundles/configuration.jar \
  reference:file:sc-bundles/resourcemanager.jar \
+ reference:file:sc-bundles/jfontchooserlib.jar \
  reference:file:sc-bundles/defaultresources.jar
 
 felix.auto.start.45= \
diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index e8817aa95..ccd501171 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -59,6 +59,7 @@ felix.auto.start.4= \
  file:sc-bundles/configuration.jar \
  reference:file:sc-bundles/resourcemanager.jar \
  reference:file:sc-bundles/defaultresources.jar \
+ reference:file:sc-bundles/jfontchooserlib.jar \
  reference:file:sc-bundles/version.jar \
  reference:file:sc-bundles/version-impl.jar \
  file:sc-bundles/netaddr.jar
diff --git a/lib/installer-exclude/jfontchooser.manifest.mf b/lib/installer-exclude/jfontchooser.manifest.mf
new file mode 100644
index 000000000..053f5e062
--- /dev/null
+++ b/lib/installer-exclude/jfontchooser.manifest.mf
@@ -0,0 +1,9 @@
+Bundle-Name: JFontChooser
+Bundle-Description: A library containing a Java Font Chooser
+Bundle-Vendor: sip-communicator.org
+Bundle-Version: 0.0.1
+Import-Package: javax.swing,
+ javax.swing.border,
+ javax.swing.event,
+ javax.swing.text
+Export-Package: say.swing