diff --git a/sonos-java/pom.xml b/sonos-java/pom.xml
index 2fcd996..ce85245 100644
--- a/sonos-java/pom.xml
+++ b/sonos-java/pom.xml
@@ -51,12 +51,16 @@
 							src/build/distrib.xml
 						</descriptor>
 					</descriptors>
-					<!-- <outputDirectory> -->
-					<!-- target/zip-ressources -->
-					<!-- </outputDirectory> -->
-					<attach>false</attach>
-					<!-- <runOnlyAtExecutionRoot>true</runOnlyAtExecutionRoot> -->
 				</configuration>
+				<executions>
+					<execution>
+						<id>make-assembly</id>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 
 			<plugin>
@@ -64,13 +68,11 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
-						<manifestEntries>
-							<Main-Class>org.tensin.sonos.run.Sonos</Main-Class>
-						</manifestEntries>
+						<manifest>
+							<addClasspath>true</addClasspath>
+							<Main-Class>org.tensin.sonos.commander.CLIController</Main-Class>
+						</manifest>
 					</archive>
-					<excludes>
-						<exclude>**/*.java</exclude>
-					</excludes>
 				</configuration>
 			</plugin>
 
diff --git a/sonos-java/src/build/distrib.xml b/sonos-java/src/build/distrib.xml
index b44a0f2..715619a 100644
--- a/sonos-java/src/build/distrib.xml
+++ b/sonos-java/src/build/distrib.xml
@@ -1,40 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <assembly>
-	<id>dist</id>
-	<formats>
-		<format>zip</format>
-	</formats>
-	<fileSets>
-		<!-- dependencies -->
-		<fileSet>
-			<directory>target/dependency/</directory>
-			<outputDirectory>lib/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-		</fileSet>
-		<!-- current jar -->
-		<fileSet>
-			<directory>target/</directory>
-			<outputDirectory>lib/</outputDirectory>
-			<includes>
-				<include>*.jar</include>
-			</includes>
-			<excludes>
-				<exclude>*-javadoc.jar</exclude>
-				<exclude>*-sources.jar</exclude>
-			</excludes>
-		</fileSet>
-		<!-- launch script -->
-		<fileSet>
-			<directory>src/script</directory>
-			<outputDirectory>.</outputDirectory>
-			<includes>
-				<include>*.sh</include>
-			</includes>
-			<excludes>
-				<exclude>deploy.sh</exclude>
-			</excludes>
-		</fileSet>
-	</fileSets>
-</assembly>
\ No newline at end of file
+    <id>dist</id>
+    <formats>
+        <format>zip</format>
+        <format>tar.gz</format>
+    </formats>
+    <files>
+        <file>
+            <source>src/script/sonos.sh</source>
+            <outputDirectory>/</outputDirectory>
+        </file>
+    </files>
+    <dependencySets>
+        <!-- dependencies -->
+        <dependencySet>
+            <useProjectArtifact>true</useProjectArtifact>
+            <outputDirectory>lib/</outputDirectory>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+</assembly>
diff --git a/sonos-java/src/main/java/org/tensin/sonos/commander/CLIController.java b/sonos-java/src/main/java/org/tensin/sonos/commander/CLIController.java
index a824b00..4235f54 100644
--- a/sonos-java/src/main/java/org/tensin/sonos/commander/CLIController.java
+++ b/sonos-java/src/main/java/org/tensin/sonos/commander/CLIController.java
@@ -58,6 +58,9 @@ public static SystemHelper getSystemHelper() {
      *             the sonos exception
      */
     public static void main(final String args[]) throws SonosException {
+	// CLINQ library is not compatible with IPv6 stack
+	// (which is, by the way, for example the default in recent archlinux distributions)
+	System.setProperty("java.net.preferIPv4Stack", "true"); 
         final CLIController a = createController();
         a.start(args);
     }
diff --git a/sonos-java/src/test/java/org/tensin/sonos/CLITestCase.java b/sonos-java/src/test/java/org/tensin/sonos/ClientIT.java
similarity index 99%
rename from sonos-java/src/test/java/org/tensin/sonos/CLITestCase.java
rename to sonos-java/src/test/java/org/tensin/sonos/ClientIT.java
index 2fa3057..96eb503 100644
--- a/sonos-java/src/test/java/org/tensin/sonos/CLITestCase.java
+++ b/sonos-java/src/test/java/org/tensin/sonos/ClientIT.java
@@ -17,7 +17,7 @@
 /**
  * The Class CLITestCase.
  */
-public class CLITestCase {
+public class ClientIT {
 
     /** The zone command dispatcher. */
     private final ZoneCommandDispatcher zoneCommandDispatcher = ZoneCommandDispatcher.getInstance();
diff --git a/sonos-java/src/test/java/org/tensin/sonos/ClingTestCase.java b/sonos-java/src/test/java/org/tensin/sonos/ClingIT.java
similarity index 99%
rename from sonos-java/src/test/java/org/tensin/sonos/ClingTestCase.java
rename to sonos-java/src/test/java/org/tensin/sonos/ClingIT.java
index 8c7b2e4..ee96aca 100644
--- a/sonos-java/src/test/java/org/tensin/sonos/ClingTestCase.java
+++ b/sonos-java/src/test/java/org/tensin/sonos/ClingIT.java
@@ -13,7 +13,7 @@
 /**
  * The Class ClingTestCase.
  */
-public class ClingTestCase {
+public class ClingIT {
 
     /**
      * Test discovery.
diff --git a/sonos-root/pom.xml b/sonos-root/pom.xml
index c7d8392..fe7fb59 100644
--- a/sonos-root/pom.xml
+++ b/sonos-root/pom.xml
@@ -104,7 +104,19 @@
 					<includeScope>compile</includeScope>
 				</configuration>
 			</plugin>
-
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.12.4</version>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<artifactId>maven-eclipse-plugin</artifactId>
 				<version>2.8</version>