diff --git a/lib/felix.unit.test.properties b/lib/felix.unit.test.properties
index 769c8762a..e93ada35f 100644
--- a/lib/felix.unit.test.properties
+++ b/lib/felix.unit.test.properties
@@ -47,7 +47,9 @@ felix.auto.start.10= \
  reference:file:lib/bundle/junit.jar \
  reference:file:lib/installer-exclude/easymock-3.1.jar \
  reference:file:lib/installer-exclude/objenesis-1.2.jar \
- reference:file:lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar
+ reference:file:lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar \
+ reference:file:sc-bundles/bouncycastle.jar \
+ reference:file:sc-bundles/bccontrib.jar
 # file:lib/bundle/shell.jar \
 # file:lib/bundle/bundlerepository.jar \
 # file:lib/bundle/servicebinder.jar \
diff --git a/resources/install/build.xml b/resources/install/build.xml
index 77c8a3b41..cd7985d85 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -2282,7 +2282,7 @@
         </unzip>
 
         <!-- zrtp4j -->
-        <unzip src="${sc.basedir}/../libsrc/zrtp4j-src-2.3.0.zip"
+        <unzip src="${sc.basedir}/../libsrc/zrtp4j-src-3.1.0.zip"
                dest="${debian.src.dir}/lib/src"/>
 
         <!-- joscar -->