diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 1a06807..fd21ea7 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -1,2 +1,2 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/device_peregrine.mk
+    $(LOCAL_DIR)/full_peregrine.mk
diff --git a/BoardConfig.mk b/BoardConfig.mk
index f047fb6..f1e5aff 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -29,6 +29,7 @@
 LOCAL_PATH := device/motorola/perergine
 
 BOARD_CUSTOM_BOOTIMG_MK := device/motorola/peregrine/mkbootimg.mk
+BOARD_HAS_NO_MISC_PARTITION := true
 
 # fix this up by examining /proc/mtd on a running device
 BOARD_USERDATAIMAGE_PARTITION_SIZE := 8589934592
diff --git a/cm.mk b/cm.mk
index cc2cfe4..2e02c6a 100644
--- a/cm.mk
+++ b/cm.mk
@@ -1,18 +1,13 @@
-## Specify phone tech before including full_phone
-$(call inherit-product, vendor/cm/config/gsm.mk)
-
-# Release name
-PRODUCT_RELEASE_NAME := peregrine
-
 # Inherit some common CM stuff.
 $(call inherit-product, vendor/cm/config/common_full_phone.mk)
 
+# Boot animation
+TARGET_SCREEN_WIDTH := 720
+TARGET_SCREEN_HEIGHT := 1280
+
 # Inherit device configuration
-$(call inherit-product, device/motorola/peregrine/device_peregrine.mk)
+$(call inherit-product, device/motorola/peregrine/full_peregrine.mk)
 
 ## Device identifier. This must come after all inclusions
-PRODUCT_DEVICE := peregrine
+PRODUCT_RELEASE_NAME := peregrine
 PRODUCT_NAME := cm_peregrine
-PRODUCT_BRAND := motorola
-PRODUCT_MODEL := peregrine
-PRODUCT_MANUFACTURER := motorola
diff --git a/device-proprietary-files.txt b/device-proprietary-files.txt
new file mode 100644
index 0000000..9aecffe
--- /dev/null
+++ b/device-proprietary-files.txt
@@ -0,0 +1,2 @@
+# proprietary file list
+# bin/filename
diff --git a/device_peregrine.mk b/device_peregrine.mk
index 20d3f7a..e7d71e6 100644
--- a/device_peregrine.mk
+++ b/device_peregrine.mk
@@ -1,14 +1,18 @@
 $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk)
 
-# The gps config appropriate for this device
-$(call inherit-product, device/common/gps/gps_us_supl.mk)
-
 $(call inherit-product-if-exists, vendor/motorola/peregrine/peregrine-vendor.mk)
 
-DEVICE_PACKAGE_OVERLAYS += device/motorola/peregrine/overlay
+LOCAL_PATH := device/motorola/peregrine
 
-$(call inherit-product, build/target/product/full.mk)
+# peregrine specific overlay
+DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay
 
-PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0
-PRODUCT_NAME := full_peregrine
-PRODUCT_DEVICE := peregrine
+PRODUCT_LOCALES := en_US
+PRODUCT_LOCALES += xhdpi
+PRODUCT_AAPT_CONFIG := normal hdpi xhdpi
+PRODUCT_AAPT_PREF_CONFIG := xhdpi
+
+$(call inherit-product, frameworks/native/build/phone-xhdpi-1024-dalvik-heap.mk)
+
+$(call inherit-product, device/motorola/msm8226-common/msm8226.mk)
+$(call inherit-product, device/motorola/msm8226-common/keylayout/keylayout.mk)
diff --git a/extract-files.sh b/extract-files.sh
new file mode 100755
index 0000000..246c631
--- /dev/null
+++ b/extract-files.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+export VENDOR=motorola
+export DEVICE=peregrine
+# Comment these out if there is no common device tree for this device
+export COMMON_DEVICE=msm8226-common
+export BOARD_VENDOR=motorola-qcom
+export TARGET_BOARD_PLATFORM=msm8226
+
+../$COMMON_DEVICE/extract-files.sh $@
diff --git a/full_peregrine.mk b/full_peregrine.mk
new file mode 100644
index 0000000..648054d
--- /dev/null
+++ b/full_peregrine.mk
@@ -0,0 +1,36 @@
+#
+# Copyright (C) 2013 The CyanogenMod Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#
+# This file is the build configuration for a full Android
+# build for peregrine hardware. This cleanly combines a set of
+# device-specific aspects (drivers) with a device-agnostic
+# product configuration (apps). Except for a few implementation
+# details, it only fundamentally contains two inherit-product
+# lines, full and peregrine, hence its name.
+#
+
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk)
+# Inherit from peregrine device
+$(call inherit-product, device/motorola/peregrine/device_peregrine.mk)
+
+## Device identifier. This must come after all inclusions
+PRODUCT_DEVICE := peregrine
+PRODUCT_NAME := full_peregrine
+PRODUCT_BRAND := motorola
+PRODUCT_MODEL := peregrine
+PRODUCT_MANUFACTURER := motorola
diff --git a/recovery.fstab b/recovery.fstab
deleted file mode 100644
index 402de79..0000000
--- a/recovery.fstab
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2011, The Linux Foundation. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-#       copyright notice, this list of conditions and the following
-#       disclaimer in the documentation and/or other materials provided
-#       with the distribution.
-#     * Neither the name of The Linux Foundation nor the names of its
-#       contributors may be used to endorse or promote products derived
-#       from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
-# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-# BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-# IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# mount point	fstype		device			[device2] [length=]
-
-boot		/boot		emmc    defaults                                                        defaults
-cache		/cache          ext4    noatime,nosuid,nodev,barrier=1,data=ordered                     wait,check
-misc		/misc           emmc    defaults                                                        defaults
-recovery	/recovery       emmc    defaults                                                        defaults
-userdata	/data           f2fs    noatime,nosuid,nodev,barrier=1,data=ordered,noauto_da_alloc     wait,check
-system		/system         ext4    ro,barrier=1                                                    wait
-modem		/modem          ext4    defaults                                                        defaults
-customize	/customize      ext4    defaults                                                        defaults
-
diff --git a/system.prop b/system.prop
index 450bc8b..5f9c2f2 100644
--- a/system.prop
+++ b/system.prop
@@ -1,3 +1,4 @@
 #
 # system.prop for peregrine
 #
+rild.libargs=-d /dev/smd0