diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 064243fbbb1087fe76a94a10efd4b69351c71006..5bb12fab3a213f2810ca76c0c0cbeb40cce741d6 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -199,6 +199,21 @@
             </intent-filter>
         </activity>
 
+
+        <!--System Updater-->
+        <activity android:name="Settings$SystemUpdaterActivity"
+            android:label="@string/system_update_settings_list_item_title"
+            android:icon="@drawable/ic_system_update">
+            <intent-filter android:priority="100">
+                <action android:name="com.android.settings.action.SETTINGS" />
+            </intent-filter>
+            <meta-data android:name="com.android.settings.category"
+                android:value="com.android.settings.category.ia.homepage" />
+            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
+                android:value="com.android.settings.SystemUpdaterSettings" />
+        </activity>
+
+
         <!-- Wireless Controls -->
 
         <activity android:name="Settings$WirelessSettingsActivity"
diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 921dfc10d6d9843fe4625c7a4b7667eeb0f63eaa..04597ddf829017751fab9fa9c8034552b3d237d5 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -26,14 +26,6 @@
                 android:title="@string/mod_version"
                 android:summary="@string/mod_version_default" />
 
-        <!-- System update settings - launches activity -->
-        <PreferenceScreen android:key="system_update_settings"
-                android:title="@string/system_update_settings_list_item_title"
-                android:summary="@string/system_update_settings_list_item_summary">
-            <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
-        </PreferenceScreen>
-
-
         <PreferenceScreen android:key="additional_system_update_settings"
                           android:title="@string/additional_system_update_settings_list_item_title">
             <intent android:action="android.intent.action.MAIN"
diff --git a/res/xml/system_updater_prefs.xml b/res/xml/system_updater_prefs.xml
new file mode 100644
index 0000000000000000000000000000000000000000..88493cbd3d95934d8fa02de6a69cd18a95268e44
--- /dev/null
+++ b/res/xml/system_updater_prefs.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="system_update_settings"
+    android:summary="@string/system_update_settings_list_item_summary"
+    android:title="@string/system_update_settings_list_item_title">
+    <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+</PreferenceScreen>
\ No newline at end of file
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 97b6f9f4797784d7d85219138700047c2a98acd2..fbb7e967171792424461aaa01e55885f575bcab1 100755
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -374,7 +374,8 @@ public class SettingsActivity extends SettingsDrawerActivity
             ManageDomainUrls.class.getName(),
             AutomaticStorageManagerSettings.class.getName(),
             MicroGSettings.class.getName(),
-            OpenKeychainSettings.class.getName()
+            OpenKeychainSettings.class.getName(),
+            SystemUpdaterSettings.class.getName()
     };
 
 
diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java
new file mode 100644
index 0000000000000000000000000000000000000000..4f93861b1426d68424bf94473ed592e5b770d357
--- /dev/null
+++ b/src/com/android/settings/SystemUpdaterSettings.java
@@ -0,0 +1,51 @@
+package com.android.settings;
+
+import android.os.Bundle;
+import android.content.Intent;
+import android.content.ComponentName;
+import android.app.Fragment;
+
+import android.app.Activity;
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import java.util.ArrayList;
+import java.util.List;
+
+
+public class SystemUpdaterSettings extends Fragment {
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Intent intent = new Intent("android.settings.SYSTEM_UPDATE_SETTINGS");
+        startActivity(intent);
+
+        Activity activity = getActivity();
+
+        if (activity != null) {
+            activity.finish();
+        }
+
+    }
+
+
+    public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
+                                                                            boolean enabled) {
+                    final ArrayList<SearchIndexableResource> result = new ArrayList<>();
+
+                    final SearchIndexableResource sir = new SearchIndexableResource(context);
+                    sir.xmlResId = R.xml.system_updater_prefs;
+                    result.add(sir);
+                    return result;
+                }
+            };
+
+
+}
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 99b36437567560e691c69b94d326df63d9606eb0..82f2229d160d6a073f4a88a9cf87776eb41c61d8 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -25,6 +25,7 @@ import com.android.settings.LegalSettings;
 import com.android.settings.PrivacySettings;
 import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
+import com.android.settings.SystemUpdaterSettings;
 import com.android.settings.WallpaperTypeSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
@@ -91,6 +92,7 @@ public final class Ranking {
     public static final int RANK_GESTURE = 24;
     public static final int RANK_MICROG = 25;
     public static final int RANK_OPENKEYCHAIN = 26;
+    public static final int RANK_UPDATER = 27;
 
     public static final int RANK_UNDEFINED = -1;
     public static final int RANK_OTHERS = 1024;
@@ -195,6 +197,9 @@ public final class Ranking {
         // OpenKeychain
         sRankMap.put(OpenKeychainSettings.class.getName(), RANK_OPENKEYCHAIN);
 
+        // System Update
+        sRankMap.put(SystemUpdaterSettings.class.getName(), RANK_UPDATER);
+
         sBaseRankMap.put("com.android.settings", 0);
     }
 
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index a2878a894391e4634ce23693c46d6640fbb78fd6..7360e1efe54f7dd3949d5e8a7a741efa884cd0a7 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -26,6 +26,7 @@ import com.android.settings.PrivacySettings;
 import com.android.settings.R;
 import com.android.settings.ScreenPinningSettings;
 import com.android.settings.SecuritySettings;
+import com.android.settings.SystemUpdaterSettings;
 import com.android.settings.WallpaperTypeSettings;
 import com.android.settings.WirelessSettings;
 import com.android.settings.accessibility.AccessibilitySettings;
@@ -69,6 +70,14 @@ public final class SearchIndexableResources {
             new HashMap<String, SearchIndexableResource>();
 
     static {
+
+        sResMap.put(SystemUpdaterSettings.class.getName(),
+                new SearchIndexableResource(
+                        Ranking.getRankForClassName(SystemUpdaterSettings.class.getName()),
+                        R.xml.system_updater_prefs,
+                        SystemUpdaterSettings.class.getName(),
+                        R.drawable.ic_system_update));
+
         sResMap.put(WifiSettings.class.getName(),
                 new SearchIndexableResource(
                         Ranking.getRankForClassName(WifiSettings.class.getName()),