diff --git a/build.xml b/build.xml
index 6a7e7bd56..b5a197b0d 100644
--- a/build.xml
+++ b/build.xml
@@ -281,7 +281,7 @@
         <javac classpathref="compile.class.path" debug="true"
             deprecation="true" destdir="${dest}" nowarn="false"
             includeantruntime="false"
-            source="1.5" target="1.5" memoryMaximumSize="400M" fork="true">
+            source="1.6" target="1.6" memoryMaximumSize="400M" fork="true">
                 <src path="${src}"/>
                 <src path="${src2}"/>
                 <include name="**/*.java" />
@@ -394,7 +394,7 @@
         description="Generates project javadoc.">
         <javadoc author="true" destdir="${java.doc}" package="true"
             version="true" use="true" windowtitle="Jitsi API"
-            classpathref="compile.class.path" source="1.5+" maxmemory="256m">
+            classpathref="compile.class.path" source="1.6+" maxmemory="256m">
             <packageset dir="${src}">
                 <exclude name="net/java/sip/communicator/impl/version/**"/>
                 <include name="**"/>
@@ -466,7 +466,7 @@
         </delete>
         <javac
             classpathref="compile.class.path" includeantruntime="false"
-            destdir="${dest}" source="1.5" target="1.5">
+            destdir="${dest}" source="1.6" target="1.6">
             <src path="${src}"/>
             <include name="net/java/sip/communicator/impl/version/NightlyBuildID.java" />
             <include name="net/java/sip/communicator/impl/version/VersionImpl.java" />
diff --git a/lib/installer-exclude/libjitsi.jar b/lib/installer-exclude/libjitsi.jar
index 131c40d04..d281958b9 100644
Binary files a/lib/installer-exclude/libjitsi.jar and b/lib/installer-exclude/libjitsi.jar differ
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java
index 39b4c8744..4f5b4d23e 100644
--- a/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java
+++ b/src/net/java/sip/communicator/impl/protocol/sip/CallPeerMediaHandlerSipImpl.java
@@ -6,8 +6,6 @@
  */
 package net.java.sip.communicator.impl.protocol.sip;
 
-import ch.imvs.sdes4j.srtp.*;
-
 import java.net.*;
 import java.util.*;
 
@@ -24,6 +22,8 @@
 import org.jitsi.service.neomedia.device.*;
 import org.jitsi.service.neomedia.format.*;
 
+import ch.imvs.sdes4j.srtp.*;
+
 /**
  * The media handler class handles all media management for a single
  * <tt>CallPeer</tt>. This includes initializing and configuring streams,