diff --git a/embedding/android/AndroidManifest.xml.in b/embedding/android/AndroidManifest.xml.in
index 32e003631ccc..2b46333967f7 100644
--- a/embedding/android/AndroidManifest.xml.in
+++ b/embedding/android/AndroidManifest.xml.in
@@ -9,9 +9,21 @@
       android:sharedUserId="@MOZ_ANDROID_SHARED_ID@"
 #endif
       >
+
+#ifdef MOZ_TABLETS_ONLY
+    <uses-sdk android:minSdkVersion="11"
+#else
     <uses-sdk android:minSdkVersion="5"
+#endif
               android:targetSdkVersion="11"/>
 
+#ifdef MOZ_TABLETS_ONLY
+    <supports-screens android:smallScreens="false"
+                      android:normalScreens="false"
+                      android:largeScreens="false"
+                      android:xlargeScreens="true" />
+#endif
+
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/embedding/android/Makefile.in b/embedding/android/Makefile.in
index b5514372d6de..837b0a025a35 100644
--- a/embedding/android/Makefile.in
+++ b/embedding/android/Makefile.in
@@ -79,7 +79,12 @@ MIN_CPU_VERSION=5
 endif
 
 ifeq (,$(ANDROID_VERSION_CODE))
-ANDROID_VERSION_CODE=$(shell $(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10)
+# decrement the version code by 1 so native fennec will win any compatability ties
+ANDROID_VERSION_CODE=$(shell echo `$(PYTHON) $(topsrcdir)/toolkit/xre/make-platformini.py --print-buildid | cut -c1-10` + 1 | bc)
+endif
+
+ifeq (Tablets,$(MOZ_MOBILE_COMPAT))
+MOZ_TABLETS_ONLY=1
 endif
 
 DEFINES += \
@@ -92,6 +97,7 @@ DEFINES += \
   -DMOZ_CRASHREPORTER=$(MOZ_CRASHREPORTER) \
   -DANDROID_VERSION_CODE=$(ANDROID_VERSION_CODE) \
   -DMOZILLA_OFFICIAL=$(MOZILLA_OFFICIAL) \
+  -DMOZ_TABLETS_ONLY=$(MOZ_TABLETS_ONLY) \
   $(NULL)
 
 GARBAGE += \
diff --git a/mobile/xul/branding/aurora/configure.sh b/mobile/xul/branding/aurora/configure.sh
index d39212ccf388..3eb7fa3bcbd8 100644
--- a/mobile/xul/branding/aurora/configure.sh
+++ b/mobile/xul/branding/aurora/configure.sh
@@ -1,3 +1,4 @@
 MOZ_APP_DISPLAYNAME=Aurora
 ANDROID_PACKAGE_NAME=org.mozilla.fennec_aurora
 MOZ_UPDATER=1
+MOZ_MOBILE_COMPAT=Tablets
diff --git a/mobile/xul/branding/beta/configure.sh b/mobile/xul/branding/beta/configure.sh
index 9d89bf17bb98..0971c3875e83 100644
--- a/mobile/xul/branding/beta/configure.sh
+++ b/mobile/xul/branding/beta/configure.sh
@@ -1,3 +1,4 @@
 MOZ_APP_DISPLAYNAME="Firefox Beta"
 ANDROID_PACKAGE_NAME=org.mozilla.firefox_beta
 MOZ_UPDATER=
+MOZ_MOBILE_COMPAT=Tablets
diff --git a/mobile/xul/branding/nightly/configure.sh b/mobile/xul/branding/nightly/configure.sh
index 0917293c83de..95852821752a 100644
--- a/mobile/xul/branding/nightly/configure.sh
+++ b/mobile/xul/branding/nightly/configure.sh
@@ -1,2 +1,3 @@
 MOZ_APP_DISPLAYNAME=Nightly
 MOZ_UPDATER=1
+MOZ_MOBILE_COMPAT=All
diff --git a/mobile/xul/branding/official/configure.sh b/mobile/xul/branding/official/configure.sh
index 5078894daebc..e936558db59d 100644
--- a/mobile/xul/branding/official/configure.sh
+++ b/mobile/xul/branding/official/configure.sh
@@ -1,3 +1,4 @@
 MOZ_APP_DISPLAYNAME=Firefox
 ANDROID_PACKAGE_NAME=org.mozilla.firefox
 MOZ_UPDATER=
+MOZ_MOBILE_COMPAT=Tablets
diff --git a/mobile/xul/branding/unofficial/configure.sh b/mobile/xul/branding/unofficial/configure.sh
index 0145020011ca..96541eafe973 100644
--- a/mobile/xul/branding/unofficial/configure.sh
+++ b/mobile/xul/branding/unofficial/configure.sh
@@ -1,3 +1,4 @@
 ANDROID_PACKAGE_NAME=org.mozilla.fennec_`echo $USER`
 MOZ_APP_DISPLAYNAME=Fennec
 MOZ_UPDATER=
+MOZ_MOBILE_COMPAT=All