diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7bef65657ec5c2a002fbbd3638870a17af1fd2ee..4eb186d32c2396338997de6030ef0e2cc833a66c 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -181,13 +181,14 @@
         <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>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.DEFAULT" />
             </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" />
+            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
+                android:value="true" />
         </activity>
 
 
diff --git a/res/xml/top_level_settings.xml b/res/xml/top_level_settings.xml
index 367f426f5fb86fe02dc00563f371bc7ad70e555a..68ba4d019317df931cac0fa758df6e4722aa8661 100644
--- a/res/xml/top_level_settings.xml
+++ b/res/xml/top_level_settings.xml
@@ -20,6 +20,18 @@
     xmlns:settings="http://schemas.android.com/apk/res-auto"
     android:key="top_level_settings">
 
+    <Preference
+        android:key="top_level_update"
+        android:title="@string/system_update_settings_list_item_title"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_system_update"
+        android:order="-150"
+        android:fragment="com.android.settings.SystemUpdaterSettings"
+        settings:controller="com.android.settings.system.SystemUpdatePreferenceController"
+        settings:keywords="@string/keywords_system_update_settings">
+        <intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS" />
+    </Preference>
+
     <Preference
         android:key="top_level_network"
         android:title="@string/network_dashboard_title"
diff --git a/src/com/android/settings/SystemUpdaterSettings.java b/src/com/android/settings/SystemUpdaterSettings.java
index f2b025d257e78eb4915ff0986d7a2b3f70d3ee0d..6fe8416bc788d40599b4f74156e9917d69b873ec 100644
--- a/src/com/android/settings/SystemUpdaterSettings.java
+++ b/src/com/android/settings/SystemUpdaterSettings.java
@@ -11,10 +11,12 @@ import android.provider.SearchIndexableResource;
 import com.android.settings.R;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
+import com.android.settingslib.search.SearchIndexable;
+
 import java.util.ArrayList;
 import java.util.List;
 
-
+@SearchIndexable
 public class SystemUpdaterSettings extends Fragment {
 
     @Override
@@ -29,10 +31,8 @@ public class SystemUpdaterSettings extends Fragment {
         if (activity != null) {
             activity.finish();
         }
-
     }
 
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -46,7 +46,4 @@ public class SystemUpdaterSettings extends Fragment {
                     return result;
                 }
             };
-
-
 }
-