diff --git a/app/build.gradle b/app/build.gradle
index 9926d53..a2b8abe 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -55,6 +55,7 @@ android {
         versionCode System.getenv("BUILD_NUMBER") as Integer ?: 5
         versionName "1.0.4-SNAPSHOT"
         archivesBaseName = "LedD-" + versionName + "-" + versionCode
+        manifestPlaceholders = [HOCKEYAPP_APP_ID: "7febd1d2266a4f0c81667ca4e3d11fd3"]
     }
     buildTypes {
         release {
@@ -77,6 +78,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.6.2'
     compile 'com.jakewharton:butterknife:8.0.1'
     apt 'com.jakewharton:butterknife-compiler:8.0.1'
+    compile 'net.hockeyapp.android:HockeySDK:4.0.0'
     compile 'com.koushikdutta.async:androidasync:2.1.7'
     compile 'com.android.support:design:23.3.0'
     compile 'com.larswerkman:HoloColorPicker:1.5@aar'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b563199..901d8b8 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,9 +17,8 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<manifest
-    package="com.idlegandalf.ledd"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.idlegandalf.ledd">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
@@ -58,6 +57,9 @@
         </activity>
 
         <service android:name=".services.ColorService"/>
+        <meta-data
+            android:name="net.hockeyapp.android.appIdentifier"
+            android:value="${HOCKEYAPP_APP_ID}" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java b/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
index 0186102..ac4800f 100644
--- a/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
+++ b/app/src/main/java/com/idlegandalf/ledd/ColorActivity.java
@@ -65,6 +65,9 @@ import com.mikepenz.materialdrawer.model.SecondarySwitchDrawerItem;
 import com.mikepenz.materialdrawer.model.SwitchDrawerItem;
 import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 
+import net.hockeyapp.android.CrashManager;
+import net.hockeyapp.android.UpdateManager;
+
 import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
@@ -175,6 +178,8 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
 
         daemonsListener = new refreshDaemonsListener();
         registerReceiver(daemonsListener, new IntentFilter(ColorApplication.INTENT_ACTION_REFRESH));
+
+        checkForUpdates();
     }
 
     @Override
@@ -245,6 +250,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
     @Override
     protected void onPause() {
         super.onPause();
+        unregisterManagers();
         ColorApplication.getInstance().teardown();
         unregisterReceiver(daemonsListener);
 
@@ -259,11 +265,13 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
     protected void onDestroy() {
         super.onDestroy();
         ColorApplication.getInstance().teardown();
+        unregisterManagers();
     }
 
     @Override
     protected void onResume() {
         super.onResume();
+
         if (!fromOnCreate) {
             ColorApplication.getInstance().onResume();
             registerReceiver(daemonsListener, new IntentFilter(ColorApplication.INTENT_ACTION_REFRESH));
@@ -271,6 +279,7 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
         } else {
             fromOnCreate = false;
         }
+        checkForCrashes();
     }
 
 
@@ -524,6 +533,19 @@ public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerI
         return null;
     }
 
+    private void checkForCrashes() {
+        CrashManager.register(this);
+    }
+
+    private void checkForUpdates() {
+        // Remove this for store builds!
+        UpdateManager.register(this);
+    }
+
+    private void unregisterManagers() {
+        UpdateManager.unregister();
+    }
+
     protected class refreshDaemonsListener extends BroadcastReceiver {
 
         @Override