diff --git a/build.xml b/build.xml
index c93eb6ee7..dc3d63627 100644
--- a/build.xml
+++ b/build.xml
@@ -1846,7 +1846,8 @@ javax.swing.event, javax.swing.border"/>
 
             <zipfileset src="${lib.noinst}/zrtp4j-0.9.0.jar" prefix=""/>
             <manifest>
-		<attribute name="Export-Package" value="gnu.java.zrtp,gnu.java.zrtp.packets,gnu.java.zrtp.utils,gnu.java.zrtp.zidfile"/>
+                <attribute name="Export-Package" value="gnu.java.zrtp,gnu.java.zrtp.packets,gnu.java.zrtp.utils,gnu.java.zrtp.zidfile"/>
+                <attribute name="Import-Package" value="javax.crypto,javax.crypto.spec,javax.crypto.interfaces"/>
                 <attribute name="Bundle-Name" value="ZRTP4J"/>
                 <attribute name="Bundle-Description" value="ZRTP for Java library."/>
             </manifest>
diff --git a/lib/felix.client.run.properties b/lib/felix.client.run.properties
index 7f3861cf8..8e9accd95 100644
--- a/lib/felix.client.run.properties
+++ b/lib/felix.client.run.properties
@@ -47,11 +47,7 @@ org.osgi.framework.system.packages= org.osgi.framework; ; version=1.3.0, \
  org.bouncycastle.crypto.digests; \
  org.bouncycastle.crypto.macs; \
  org.bouncycastle.crypto.params; \
- org.bouncycastle.crypto.engines; \
- gnu.java.zrtp; \
- gnu.java.zrtp.packets; \
- gnu.java.zrtp.utils; \
- gnu.java.zrtp.zidfile
+ org.bouncycastle.crypto.engines; 
 
 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