diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..a2014f7
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/Smack"]
+	path = libs/Smack
+	url = git@github.com:vanitasvitae/Smack.git
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index ac07efe..1caf621 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,44 @@
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
         <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
+          <compositeBuild compositeDefinitionSource="SCRIPT">
+            <builds>
+              <build path="$PROJECT_DIR$/libs/Smack" name="Smack">
+                <projects>
+                  <project path="$PROJECT_DIR$/libs/Smack" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-android" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-android-extensions" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-bosh" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-compression-jzlib" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-core" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-debug" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-debug-slf4j" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-experimental" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-extensions" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-im" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-integration-test" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-java7" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-jingle-old" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-legacy" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-omemo" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-omemo-signal" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-omemo-signal-integration-test" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-openpgp" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-repl" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-resolver-dnsjava" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-resolver-javax" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-resolver-minidns" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-resolver-minidns-dox" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-sasl-javax" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-sasl-provided" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-tcp" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-xmlparser" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-xmlparser-stax" />
+                  <project path="$PROJECT_DIR$/libs/Smack/smack-xmlparser-xpp3" />
+                </projects>
+              </build>
+            </builds>
+          </compositeBuild>
         </compositeConfiguration>
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
@@ -18,6 +55,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
diff --git a/README.md b/README.md
index b6826c2..74f8027 100644
--- a/README.md
+++ b/README.md
@@ -6,3 +6,12 @@
 * Components are wired together using Dependency Injection (DI) with Dagger 2
 * Data is persisted using Googles Room database library
 * UI is notified by updates to the data through the use of LiveData
+
+## Building
+
+```
+git clone <project-url>
+cd <project-directory>
+git submodule init && git submodule update
+gradle assembleDebug
+```
diff --git a/build.gradle b/build.gradle
index 5cecf98..8552784 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,9 @@ allprojects {
         mavenLocal()
 
         // Smack nightly unique snapshots repo
-        maven {
-            url 'https://igniterealtime.org/repo/'
-        }
+        //maven {
+        //    url 'https://igniterealtime.org/repo/'
+       // }
     }
 
     configurations {
@@ -38,6 +38,7 @@ allprojects {
         // https://stackoverflow.com/questions/48488563/gradle-xpp3-error/48746294#48746294
         all {
             exclude group: 'xpp3', module: 'xpp3'
+            exclude group: 'xpp3', module: 'xpp3_min'
         }
     }
 }
diff --git a/libs/Smack b/libs/Smack
new file mode 160000
index 0000000..5b23b9a
--- /dev/null
+++ b/libs/Smack
@@ -0,0 +1 @@
+Subproject commit 5b23b9a6ae137fffbf6a8ee341dc126dc40dd4e5
diff --git a/settings.gradle b/settings.gradle
index fb32cb1..4b2bc77 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -2,3 +2,5 @@ include ':app',
         ':core',
         ':persistence-room',
         ':persistence'
+
+includeBuild 'libs/Smack'