diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index 0b415be..68c575a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -251,7 +251,7 @@
 
             // add for carrier homepage feature
             String browserRes = SystemProperties.get("persist.env.c.browser.resource", "default");
-            if ("cu".equals(browserRes)) {
+            if ("cu".equals(browserRes) || "cmcc".equals(browserRes)) {
                 int resID = sResPackageCtx.getResources().getIdentifier(
                         "homepage_base", "string", "com.android.browser.res");
                 sFactoryResetUrl = sResPackageCtx.getResources().getString(resID);
diff --git a/src/com/android/browser/provider/BrowserProvider2.java b/src/com/android/browser/provider/BrowserProvider2.java
index 9577af6..36ad0ce 100644
--- a/src/com/android/browser/provider/BrowserProvider2.java
+++ b/src/com/android/browser/provider/BrowserProvider2.java
@@ -654,10 +654,14 @@
             values.put(Bookmarks.DIRTY, true);
             db.insertOrThrow(TABLE_BOOKMARKS, null, values);
 
-            addDefaultBookmarks(db, FIXED_ID_ROOT);
             // add for carrier bookmark feature
             String browserRes = SystemProperties.get("persist.env.c.browser.resource", "default");
-            if ("ct".equals(browserRes)) {
+
+            //don't add default bookmarks for cmcc
+            if (!"cmcc".equals(browserRes)) {
+                addDefaultBookmarks(db, FIXED_ID_ROOT);
+            }
+            if ("ct".equals(browserRes) || "cmcc".equals(browserRes)) {
                 addDefaultCarrierBookmarks(db, FIXED_ID_ROOT);
             }
         }
