diff --git a/build/resources/META-INF/smack-config.xml b/build/resources/META-INF/smack-config.xml
new file mode 100644
index 000000000..579dec34e
--- /dev/null
+++ b/build/resources/META-INF/smack-config.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!-- Configuration file to load at system start up -->
+<smackSystem>
+
+    <!-- Classes to load at start up -->
+    <classesToLoad>
+        <className>org.jivesoftware.smackx.ServiceDiscoveryManager</className>
+        <className>org.jivesoftware.smackx.XHTMLManager</className>
+    </classesToLoad>
+
+    <!-- Default reply timeout milliseconds -->
+    <packetReplyTimeout>5000</packetReplyTimeout>
+
+</smackSystem>
\ No newline at end of file
diff --git a/build/resources/META-INF/smack.configuration b/build/resources/META-INF/smack.configuration
deleted file mode 100644
index 1071abf1e..000000000
--- a/build/resources/META-INF/smack.configuration
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!-- Configuration file to load at system start up -->
-<smackSystem>
-
-    <!-- Smack Release -->
-    <versionNumber>1.3.0</versionNumber>
-
-    <!-- Classes to load at start up -->
-    <classesToLoad>
-        <className>org.jivesoftware.smackx.ServiceDiscoveryManager</className>
-        <className>org.jivesoftware.smackx.XHTMLManager</className>
-    </classesToLoad>
-
-    <!-- Default reply timeout milliseconds -->
-    <replyTimeout>
-        <value>5000</value>
-        <className>org.jivesoftware.smack.AccountManager</className>
-    </replyTimeout>
-
-    <!-- Default reply timeout milliseconds -->
-    <replyTimeout>
-        <value>5000</value>
-        <className>org.jivesoftware.smack.GroupChat</className>
-    </replyTimeout>
-
-    <!-- Default reply timeout milliseconds -->
-    <replyTimeout>
-        <value>5000</value>
-        <className>org.jivesoftware.smack.Roster</className>
-    </replyTimeout>
-
-    <!-- Default reply timeout milliseconds -->
-    <replyTimeout>
-        <value>5000</value>
-        <className>org.jivesoftware.smack.XMPPConnection</className>
-    </replyTimeout>
-
-</smackSystem>
\ No newline at end of file