diff --git a/build.xml b/build.xml
index 48a0aa57a..75bea81c9 100644
--- a/build.xml
+++ b/build.xml
@@ -1252,10 +1252,9 @@
             <zipfileset dir="${dest}/net/java/sip/communicator/util"
                 prefix="net/java/sip/communicator/util">
             </zipfileset>
-            <zipfileset
-                file="${src}/net/java/sip/communicator/util/services/sun.net.spi.nameservice.NameServiceDescriptor"
-            	prefix="META-INF/services"
-            />
+            <service
+                type="sun.net.spi.nameservice.NameServiceDescriptor"
+                provider="net.java.sip.communicator.util.JitsiDnsNameServiceDescriptor"/>
         </jar>
     </target>
 
diff --git a/m2/jitsi-dns/pom.xml b/m2/jitsi-dns/pom.xml
index c8fc43846..bbedef91f 100644
--- a/m2/jitsi-dns/pom.xml
+++ b/m2/jitsi-dns/pom.xml
@@ -22,6 +22,11 @@
       <artifactId>dnsjava</artifactId>
     </dependency>
     <!-- org.jitsi -->
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dnssecjava</artifactId>
+      <version>1.1</version>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>jitsi-protocol</artifactId>
diff --git a/m2/jitsi-util/pom.xml b/m2/jitsi-util/pom.xml
index a17620faa..1a01006a5 100644
--- a/m2/jitsi-util/pom.xml
+++ b/m2/jitsi-util/pom.xml
@@ -60,9 +60,27 @@
           </archive>
           <includes>
             <include>net/java/sip/communicator/util/**</include>
+            <include>META-INF/services/**</include>
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>eu.somatik.serviceloader-maven-plugin</groupId>
+        <artifactId>serviceloader-maven-plugin</artifactId>
+        <version>1.0.7</version>
+        <configuration>
+          <services>
+            <param>sun.net.spi.nameservice.NameServiceDescriptor</param>
+          </services>
+        </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/net/java/sip/communicator/util/services/sun.net.spi.nameservice.NameServiceDescriptor b/src/net/java/sip/communicator/util/services/sun.net.spi.nameservice.NameServiceDescriptor
deleted file mode 100644
index ecdbbf2f0..000000000
--- a/src/net/java/sip/communicator/util/services/sun.net.spi.nameservice.NameServiceDescriptor
+++ /dev/null
@@ -1 +0,0 @@
-net.java.sip.communicator.util.JitsiDnsNameServiceDescriptor