diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 6ebd437f..d6b50bca 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -14,6 +14,7 @@
 	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
 
 	<application
 			android:allowBackup="false"
@@ -69,6 +70,11 @@
 				<action android:name="android.intent.action.ACTION_POWER_DISCONNECTED"/>
 			</intent-filter>
 		</receiver>
+        <receiver android:name=".syncthing.BootReceiver">
+        <intent-filter>
+            <action android:name="android.intent.action.BOOT_COMPLETED"/>
+        </intent-filter>
+    </receiver>
 	</application>
 
 </manifest>
diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/BootReceiver.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/BootReceiver.java
new file mode 100644
index 00000000..82769616
--- /dev/null
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/BootReceiver.java
@@ -0,0 +1,12 @@
+package com.nutomic.syncthingandroid.syncthing;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class BootReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        context.startService(new Intent(context, SyncthingService.class));
+    }
+}