diff --git a/.sip-communicator/sip-communicator.properties b/.sip-communicator/sip-communicator.properties
new file mode 100644
index 0000000000..7dc52ce850
--- /dev/null
+++ b/.sip-communicator/sip-communicator.properties
@@ -0,0 +1,3 @@
+#Properties file for Jitsi Videobridge and libjitsi parameters.
+
+#org.jitsi.videobridge.ENABLE_STATISTICS=true
diff --git a/pom.xml b/pom.xml
index 103babaeaf..eca5a610f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -212,6 +212,91 @@
 
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>buildnumber-maven-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>validate</phase>
+            <goals>
+              <goal>create</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestEntries>
+              <git-SHA-1>${buildNumber}</git-SHA-1>
+            </manifestEntries>
+          </archive>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <createDependencyReducedPom>false</createDependencyReducedPom>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.jitsi.videobridge.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.4.3</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                  <mainClass>org.jitsi.videobridge.Main</mainClass>
+                </transformer>
+              </transformers>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -225,7 +310,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptor>src/assembly/linux-x64-bin-archive.xml</descriptor>
-              <finalName>${project.artifactId}-linux-x64-${project.version}</finalName>
+              <finalName>${project.artifactId}-linux-x64-${project.version}_${buildNumber}</finalName>
               <skipAssembly>${assembly.skipAssembly}</skipAssembly>
             </configuration>
           </execution>
@@ -238,7 +323,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptor>src/assembly/linux-x86-bin-archive.xml</descriptor>
-              <finalName>${project.artifactId}-linux-x86-${project.version}</finalName>
+              <finalName>${project.artifactId}-linux-x86-${project.version}_${buildNumber}</finalName>
               <skipAssembly>${assembly.skipAssembly}</skipAssembly>
             </configuration>
           </execution>
@@ -251,7 +336,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptor>src/assembly/macosx-bin-archive.xml</descriptor>
-              <finalName>${project.artifactId}-macosx-${project.version}</finalName>
+              <finalName>${project.artifactId}-macosx-${project.version}_${buildNumber}</finalName>
               <skipAssembly>${assembly.skipAssembly}</skipAssembly>
             </configuration>
           </execution>
@@ -264,7 +349,7 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptor>src/assembly/windows-x64-bin-archive.xml</descriptor>
-              <finalName>${project.artifactId}-windows-x64-${project.version}</finalName>
+              <finalName>${project.artifactId}-windows-x64-${project.version}_${buildNumber}</finalName>
               <skipAssembly>${assembly.skipAssembly}</skipAssembly>
             </configuration>
           </execution>
@@ -277,12 +362,25 @@
             <configuration>
               <appendAssemblyId>false</appendAssemblyId>
               <descriptor>src/assembly/windows-x86-bin-archive.xml</descriptor>
-              <finalName>${project.artifactId}-windows-x86-${project.version}</finalName>
+              <finalName>${project.artifactId}-windows-x86-${project.version}_${buildNumber}</finalName>
               <skipAssembly>${assembly.skipAssembly}</skipAssembly>
             </configuration>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <artifactId>maven-clean-plugin</artifactId>
+        <version>3.0.0</version>
+        <executions>
+          <execution>
+            <id>auto-clean</id>
+            <phase>initialize</phase>
+            <goals>
+              <goal>clean</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
diff --git a/resources/install/linux-64/jvb.sh b/resources/install/linux-64/jvb.sh
index 5105d55e9d..eee04f7954 100644
--- a/resources/install/linux-64/jvb.sh
+++ b/resources/install/linux-64/jvb.sh
@@ -34,4 +34,4 @@ fi
 
 if [ -z "$VIDEOBRIDGE_MAX_MEMORY" ]; then VIDEOBRIDGE_MAX_MEMORY=3072m; fi
 
-LD_LIBRARY_PATH=$libs exec java -Xmx$VIDEOBRIDGE_MAX_MEMORY $VIDEOBRIDGE_DEBUG_OPTIONS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Djava.library.path=$libs $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
+LD_LIBRARY_PATH=$libs exec java -Xmx$VIDEOBRIDGE_MAX_MEMORY $VIDEOBRIDGE_DEBUG_OPTIONS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/tmp -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=$SCRIPT_DIR -Djava.library.path=$libs $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
diff --git a/resources/install/linux/jvb.sh b/resources/install/linux/jvb.sh
index c38eca5683..620dde7f68 100644
--- a/resources/install/linux/jvb.sh
+++ b/resources/install/linux/jvb.sh
@@ -32,4 +32,4 @@ if [ -f $videobridge_rc  ]; then
         source $videobridge_rc
 fi
 
-exec java $VIDEOBRIDGE_DEBUG_OPTIONS -Djava.library.path=$libs $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -cp $cp $mainClass $@
+exec java $VIDEOBRIDGE_DEBUG_OPTIONS -Djava.library.path=$libs $LOGGING_CONFIG_PARAM $JAVA_SYS_PROPS -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=$SCRIPT_DIR -cp $cp $mainClass $@
diff --git a/resources/install/macosx/jvb.sh b/resources/install/macosx/jvb.sh
index 76e74fff89..f2a2164ade 100644
--- a/resources/install/macosx/jvb.sh
+++ b/resources/install/macosx/jvb.sh
@@ -28,4 +28,4 @@ if [ -f $videobridge_rc  ]; then
 fi
 
 
-exec java $VIDEOBRIDGE_DEBUG_OPTIONS -Djava.library.path=$libs -Djava.util.logging.config.file=$logging_config -cp $cp $mainClass $@
+exec java $VIDEOBRIDGE_DEBUG_OPTIONS -Djava.library.path=$libs -Djava.util.logging.config.file=$logging_config -Dnet.java.sip.communicator.SC_HOME_DIR_LOCATION=$SCRIPT_DIR -cp $cp $mainClass $@
diff --git a/src/assembly/linux-x64-bin-archive.xml b/src/assembly/linux-x64-bin-archive.xml
index 2757346335..7d75905456 100644
--- a/src/assembly/linux-x64-bin-archive.xml
+++ b/src/assembly/linux-x64-bin-archive.xml
@@ -8,14 +8,6 @@
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-linux-x64-${project.version}</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-      <useProjectArtifact>false</useProjectArtifact>
-      <unpack>false</unpack>
-    </dependencySet>
-  </dependencySets>
   <fileSets>
     <fileSet>
       <directory>${project.build.directory}</directory>
@@ -23,6 +15,9 @@
       <includes>
         <include>*.jar</include>
       </includes>
+      <excludes>
+        <exclude>original-*.jar</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/lib</directory>
@@ -45,5 +40,9 @@
         <include>jvb.sh</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/.sip-communicator</directory>
+      <outputDirectory>.sip-communicator</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>
diff --git a/src/assembly/linux-x86-bin-archive.xml b/src/assembly/linux-x86-bin-archive.xml
index df75d49160..12abdda4da 100644
--- a/src/assembly/linux-x86-bin-archive.xml
+++ b/src/assembly/linux-x86-bin-archive.xml
@@ -8,14 +8,6 @@
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-linux-x86-${project.version}</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-      <useProjectArtifact>false</useProjectArtifact>
-      <unpack>false</unpack>
-    </dependencySet>
-  </dependencySets>
   <fileSets>
     <fileSet>
       <directory>${project.build.directory}</directory>
@@ -23,6 +15,9 @@
       <includes>
         <include>*.jar</include>
       </includes>
+      <excludes>
+        <exclude>original-*.jar</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/lib</directory>
@@ -45,5 +40,9 @@
         <include>jvb.sh</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/.sip-communicator</directory>
+      <outputDirectory>.sip-communicator</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>
diff --git a/src/assembly/macosx-bin-archive.xml b/src/assembly/macosx-bin-archive.xml
index 32f86a3833..58f4295928 100644
--- a/src/assembly/macosx-bin-archive.xml
+++ b/src/assembly/macosx-bin-archive.xml
@@ -8,14 +8,6 @@
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-macosx-${project.version}</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-      <useProjectArtifact>false</useProjectArtifact>
-      <unpack>false</unpack>
-    </dependencySet>
-  </dependencySets>
   <fileSets>
     <fileSet>
       <directory>${project.build.directory}</directory>
@@ -23,6 +15,9 @@
       <includes>
         <include>*.jar</include>
       </includes>
+      <excludes>
+        <exclude>original-*.jar</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/lib</directory>
@@ -45,5 +40,9 @@
         <include>jvb.sh</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/.sip-communicator</directory>
+      <outputDirectory>.sip-communicator</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>
diff --git a/src/assembly/windows-x64-bin-archive.xml b/src/assembly/windows-x64-bin-archive.xml
index d969851b43..6a26f601e5 100644
--- a/src/assembly/windows-x64-bin-archive.xml
+++ b/src/assembly/windows-x64-bin-archive.xml
@@ -8,14 +8,6 @@
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-windows-x64-${project.version}</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-      <useProjectArtifact>false</useProjectArtifact>
-      <unpack>false</unpack>
-    </dependencySet>
-  </dependencySets>
   <fileSets>
     <fileSet>
       <directory>${project.build.directory}</directory>
@@ -23,6 +15,9 @@
       <includes>
         <include>*.jar</include>
       </includes>
+      <excludes>
+        <exclude>original-*.jar</exclude>
+      </excludes>
     </fileSet>
     <fileSet>
       <directory>${project.basedir}/lib</directory>
@@ -44,5 +39,9 @@
         <include>jvb.bat</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>${project.basedir}/.sip-communicator</directory>
+      <outputDirectory>.sip-communicator</outputDirectory>
+    </fileSet>
   </fileSets>
 </assembly>
diff --git a/src/assembly/windows-x86-bin-archive.xml b/src/assembly/windows-x86-bin-archive.xml
index 5100398317..0465547bd0 100644
--- a/src/assembly/windows-x86-bin-archive.xml
+++ b/src/assembly/windows-x86-bin-archive.xml
@@ -8,14 +8,6 @@
   </formats>
   <includeBaseDirectory>true</includeBaseDirectory>
   <baseDirectory>${project.artifactId}-windows-x86-${project.version}</baseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-      <useProjectArtifact>false</useProjectArtifact>
-      <unpack>false</unpack>
-    </dependencySet>
-  </dependencySets>
   <fileSets>
     <fileSet>
       <directory>${project.build.directory}</directory>