diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 7d981ac..9fa30d4 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,4 +16,5 @@
 
 PRODUCT_MAKEFILES := \
 	$(LOCAL_DIR)/aosp_flounder.mk \
-	$(LOCAL_DIR)/aosp_flounder64.mk
+	$(LOCAL_DIR)/aosp_flounder64.mk \
+	$(LOCAL_DIR)/aosp_flounder32.mk \
diff --git a/BoardConfig.mk b/BoardConfig.mk
index b32099b..260e41e 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -17,12 +17,23 @@
 # Use the non-open-source parts, if they're present
 -include vendor/htc/flounder/BoardConfigVendor.mk
 
-TARGET_CPU_ABI := armeabi-v7a
-TARGET_CPU_ABI2 := armeabi
-TARGET_CPU_SMP := true
-TARGET_ARCH := arm
-TARGET_ARCH_VARIANT := armv7-a-neon
-TARGET_CPU_VARIANT := cortex-a15
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+TARGET_2ND_ARCH := arm
+TARGET_2ND_ARCH_VARIANT := armv7-a-neon
+TARGET_2ND_CPU_ABI := armeabi-v7a
+TARGET_2ND_CPU_ABI2 := armeabi
+TARGET_2ND_CPU_VARIANT := cortex-a15
+
+# Disable 64-bit surfaceflinger until we have 64-bit GL libraries
+TARGET_32_BIT_SURFACEFLINGER := true
+
+# Disable emulator for "make dist" until there is a 64-bit qemu kernel
+BUILD_EMULATOR := false
 
 TARGET_NO_BOOTLOADER := true
 
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 8fc34b7..863e4b1 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -49,3 +49,5 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/buildcache/aosp_flounder)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/product/flounder)
 $(call add-clean-step, rm -rf $(OUT_DIR)/buildcache/aosp_flounder)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/product/flounder)
+$(call add-clean-step, rm -rf $(OUT_DIR)/buildcache/aosp_flounder)
diff --git a/aosp_flounder.mk b/aosp_flounder.mk
index 0d867ed..bd59ad7 100644
--- a/aosp_flounder.mk
+++ b/aosp_flounder.mk
@@ -38,11 +38,10 @@
 $(call inherit-product, device/htc/flounder/device.mk)
 
 PRODUCT_RUNTIMES := runtime_libart_default
-PRODUCT_RUNTIMES += runtime_libdvm
 
 PRODUCT_NAME := aosp_flounder
 PRODUCT_DEVICE := flounder
 PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on Flounder
-PRODUCT_MANUFACTURER := nVidia
+PRODUCT_MANUFACTURER := HTC
 PRODUCT_RESTRICT_VENDOR_FILES := owner path
diff --git a/aosp_flounder32.mk b/aosp_flounder32.mk
new file mode 100644
index 0000000..83a7d4b
--- /dev/null
+++ b/aosp_flounder32.mk
@@ -0,0 +1,48 @@
+# Copyright (C) 2013 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.
+
+#
+# This file is the build configuration for an aosp Android
+# build for flounder 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, aosp and flounder, hence its name.
+#
+
+# Live Wallpapers
+PRODUCT_PACKAGES += \
+        LiveWallpapers \
+        LiveWallpapersPicker \
+        MagicSmokeWallpapers \
+        VisualizationWallpapers \
+        librs_jni
+
+PRODUCT_PROPERTY_OVERRIDES := \
+        net.dns1=8.8.8.8 \
+        net.dns2=8.8.4.4
+
+# Inherit from those products. Most specific first.
+$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
+$(call inherit-product, device/htc/flounder/device.mk)
+
+PRODUCT_RUNTIMES := runtime_libart_default
+PRODUCT_RUNTIMES += runtime_libdvm
+
+PRODUCT_NAME := aosp_flounder32
+PRODUCT_DEVICE := flounder32
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := 32-bit AOSP on Flounder
+PRODUCT_MANUFACTURER := HTC
+PRODUCT_RESTRICT_VENDOR_FILES := owner path
diff --git a/aosp_flounder64.mk b/aosp_flounder64.mk
index 73e4f77..5e0564c 100644
--- a/aosp_flounder64.mk
+++ b/aosp_flounder64.mk
@@ -12,36 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#
-# This file is the build configuration for an aosp Android
-# build for flounder 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, aosp and flounder, hence its name.
-#
-
-# Live Wallpapers
-PRODUCT_PACKAGES += \
-        LiveWallpapers \
-        LiveWallpapersPicker \
-        MagicSmokeWallpapers \
-        VisualizationWallpapers \
-        librs_jni
-
-PRODUCT_PROPERTY_OVERRIDES := \
-        net.dns1=8.8.8.8 \
-        net.dns2=8.8.4.4
-
-# Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk)
-$(call inherit-product, device/htc/flounder/device.mk)
-
-PRODUCT_RUNTIMES := runtime_libart_default
+$(call inherit-product, $(LOCAL_PATH)/aosp_flounder.mk)
 
 PRODUCT_NAME := aosp_flounder64
-PRODUCT_DEVICE := flounder64
-PRODUCT_BRAND := Android
-PRODUCT_MODEL := AOSP on Flounder64
-PRODUCT_MANUFACTURER := nVidia
-PRODUCT_RESTRICT_VENDOR_FILES := owner path
diff --git a/flounder32/BoardConfig.mk b/flounder32/BoardConfig.mk
new file mode 100644
index 0000000..0751086
--- /dev/null
+++ b/flounder32/BoardConfig.mk
@@ -0,0 +1,17 @@
+include device/htc/flounder/BoardConfig.mk
+
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_SMP := true
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_VARIANT := cortex-a15
+
+TARGET_2ND_ARCH :=
+TARGET_2ND_ARCH_VARIANT :=
+TARGET_2ND_CPU_ABI :=
+TARGET_2ND_CPU_ABI2 :=
+TARGET_2ND_CPU_VARIANT :=
+
+# Re-enable emulator for 32-bit
+BUILD_EMULATOR := true
diff --git a/flounder64/BoardConfig.mk b/flounder64/BoardConfig.mk
index 69d9f5f..ef80b9b 100644
--- a/flounder64/BoardConfig.mk
+++ b/flounder64/BoardConfig.mk
@@ -1,19 +1 @@
 include device/htc/flounder/BoardConfig.mk
-
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv7-a-neon
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := cortex-a15
-
-# Disable 64-bit surfaceflinger until we have 64-bit GL libraries
-TARGET_32_BIT_SURFACEFLINGER := true
-
-# Disable emulator for "make dist" until there is a 64-bit qemu kernel
-BUILD_EMULATOR := false