diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6229733..3c8d1cb 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.INTERNET"></uses-permission>
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"></uses-permission>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"></uses-permission>
     
     <application android:label="@string/app_name" android:icon="@drawable/ic_launcher" android:allowBackup="true">
         
@@ -27,6 +28,12 @@
         </activity>
         
         <service android:name="TraccarService" />
+        
+        <receiver android:name="AutostartReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+            </intent-filter>
+        </receiver>
     
     </application>
 
diff --git a/src/org/traccar/client/AutostartReceiver.java b/src/org/traccar/client/AutostartReceiver.java
new file mode 100644
index 0000000..e9c0011
--- /dev/null
+++ b/src/org/traccar/client/AutostartReceiver.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2013 Anton Tananaev (anton.tananaev@gmail.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.traccar.client;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+
+public class AutostartReceiver extends BroadcastReceiver {
+	
+	public static final String LOG_TAG = "Traccar.AutostartReceiver";
+ 
+    @Override
+    public void onReceive(Context context, Intent intent) {
+    	SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+    	if (sharedPreferences.getBoolean(TraccarActivity.KEY_STATUS, false)) {
+    		context.startService(new Intent(context, TraccarService.class));
+    	}
+    }
+
+}