diff --git a/Android.mk b/Android.mk
index fc066e1..5bf51ae 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,6 +14,6 @@
 # limitations under the License.
 #
 
-ifneq ($(filter muskie, $(TARGET_DEVICE)),)
+ifneq ($(filter muskie walleye, $(TARGET_DEVICE)),)
   include $(call first-makefiles-under, $(call my-dir))
 endif
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 38e3228..3ce01cb 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,3 +16,4 @@
 
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_muskie.mk \
+    $(LOCAL_DIR)/aosp_walleye.mk \
diff --git a/aosp_muskie.mk b/aosp_muskie.mk
index b8a6823..32b7784 100644
--- a/aosp_muskie.mk
+++ b/aosp_muskie.mk
@@ -26,7 +26,7 @@ PRODUCT_MANUFACTURER := Google
 PRODUCT_RESTRICT_VENDOR_FILES := all
 
 $(call inherit-product, device/google/muskie/utils.mk)
-$(call inherit-product, device/google/muskie/device.mk)
+$(call inherit-product, device/google/muskie/device-muskie.mk)
 $(call inherit-product-if-exists, vendor/google_devices/muskie/device-vendor.mk)
 
 PRODUCT_PACKAGES += \
diff --git a/aosp_walleye.mk b/aosp_walleye.mk
new file mode 100644
index 0000000..d9ca5db
--- /dev/null
+++ b/aosp_walleye.mk
@@ -0,0 +1,33 @@
+#
+# Copyright 2016 The Android Open Source 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.
+#
+
+# Inherit from the common Open Source product configuration
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
+
+PRODUCT_NAME := aosp_walleye
+PRODUCT_DEVICE := walleye
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := AOSP on walleye
+PRODUCT_MANUFACTURER := Google
+PRODUCT_RESTRICT_VENDOR_FILES := all
+
+$(call inherit-product, device/google/muskie/utils.mk)
+$(call inherit-product, device/google/muskie/device-walleye.mk)
+$(call inherit-product-if-exists, vendor/google_devices/muskie/device-vendor.mk)
+
+PRODUCT_PACKAGES += \
+    Launcher3
diff --git a/device-common.mk b/device-common.mk
index 9e7961b..74d866b 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -58,6 +58,10 @@ BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
 MSM_VIDC_TARGET_LIST := msm8998 # Get the color format from kernel headers
 MASTER_SIDE_CP_TARGET_LIST := msm8998 # ION specific settings
 
+# Use Sdcardfs
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.sys.sdcardfs=1
+
 # A/B support
 PRODUCT_PACKAGES += \
     otapreopt_script \
@@ -251,6 +255,10 @@ PRODUCT_PACKAGES += \
     android.hardware.broadcastradio@1.0-impl \
     android.hardware.soundtrigger@2.0-impl
 
+# Thermal packages
+PRODUCT_PACKAGES += \
+    thermal.default
+
 ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
 PRODUCT_PACKAGES += \
     tinyplay \
diff --git a/device.mk b/device-muskie.mk
similarity index 86%
rename from device.mk
rename to device-muskie.mk
index 9f977c5..5cb7740 100644
--- a/device.mk
+++ b/device-muskie.mk
@@ -25,10 +25,3 @@ include device/google/muskie/device-common.mk
 PRODUCT_PROPERTY_OVERRIDES += \
     ro.sf.lcd_density=560 \
 
-# Use Sdcardfs
-PRODUCT_PROPERTY_OVERRIDES += \
-    ro.sys.sdcardfs=1
-
-# Thermal packages
-PRODUCT_PACKAGES += \
-    thermal.default
diff --git a/device-walleye.mk b/device-walleye.mk
new file mode 100644
index 0000000..6633c15
--- /dev/null
+++ b/device-walleye.mk
@@ -0,0 +1,26 @@
+#
+# Copyright 2016 The Android Open Source 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.
+#
+
+PRODUCT_AAPT_CONFIG := normal
+PRODUCT_AAPT_PREF_CONFIG := xxhdpi
+PRODUCT_AAPT_PREBUILT_DPI := xxhdpi xhdpi hdpi
+
+PRODUCT_HARDWARE := walleye
+
+include device/google/muskie/device-common.mk
+
+PRODUCT_PROPERTY_OVERRIDES += \
+    ro.sf.lcd_density=420
diff --git a/BoardConfig.mk b/muskie/BoardConfig.mk
similarity index 100%
rename from BoardConfig.mk
rename to muskie/BoardConfig.mk
diff --git a/vendorsetup.sh b/vendorsetup.sh
index e8f3589..9cc4906 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -15,3 +15,4 @@
 #
 
 add_lunch_combo aosp_muskie-userdebug
+add_lunch_combo aosp_walleye-userdebug
diff --git a/walleye/BoardConfig.mk b/walleye/BoardConfig.mk
new file mode 100644
index 0000000..0a492a8
--- /dev/null
+++ b/walleye/BoardConfig.mk
@@ -0,0 +1,20 @@
+#
+# Copyright (C) 2016 The Android Open-Source 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.
+#
+
+TARGET_BOOTLOADER_BOARD_NAME := walleye
+DEFAULT_LOW_PERSISTENCE_MODE_BRIGHTNESS := 0x00000056
+
+include device/google/muskie/CommonBoardConfig.mk