diff --git a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
index b40dd6ef6f..8b6c3b330f 100644
--- a/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
+++ b/frameworks/base/packages/SettingsProvider/res/values/defaults.xml
@@ -227,6 +227,10 @@
     <!--Default for HDMI_LCD_TIMEOUT-->
         <integer name="def_hdmi_lcd_timeout">-1</integer>
 
+    <string name="def_ntp_server" translatable="false">
+        time.windows.com
+    </string>
+
     <!-- Default for Settings.System.BUTTON_LIGHTS_ENABLED -->
     <bool name="def_button_lights_enabled">true</bool>
 
diff --git a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index c5ccf3e795..1ec35ad983 100644
--- a/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/frameworks/base/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2546,6 +2546,9 @@ public class DatabaseHelper extends SQLiteOpenHelper {
             // --- Previously in 'system'
             loadBooleanSetting(stmt, Settings.Global.AIRPLANE_MODE_ON,
                     R.bool.def_airplane_mode_on);
+               
+            loadStringSetting(stmt, Settings.Global.NTP_SERVER,
+                    R.string.def_ntp_server);
 
             loadBooleanSetting(stmt, Settings.Global.THEATER_MODE_ON,
                     R.bool.def_theater_mode_on);