diff --git a/CommonBoardConfig.mk b/CommonBoardConfig.mk
index e8b4f3a..13a7e70 100644
--- a/CommonBoardConfig.mk
+++ b/CommonBoardConfig.mk
@@ -58,4 +58,10 @@ QCOM_BOARD_PLATFORMS += msmcobalt
 BOARD_HAVE_BLUETOOTH_QCOM := true
 BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/google/muskie/bluetooth
 
+# Camera
+TARGET_USES_AOSP := true
+BOARD_QTI_CAMERA_32BIT_ONLY := true
+CAMERA_DAEMON_NOT_PRESENT := true
+TARGET_USES_ION := true
+
 -include vendor/google_devices/muskie/BoardConfigVendor.mk
diff --git a/device-common.mk b/device-common.mk
index ac82896..66d625c 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -48,6 +48,10 @@ MSM_VIDC_TARGET_LIST := msmcobalt # Get the color format from kernel headers
 MASTER_SIDE_CP_TARGET_LIST := msmcobalt # ION specific settings
 
 PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.camera.flash-autofocus.xml:system/etc/permissions/android.hardware.camera.flash-autofocus.xml \
+    frameworks/native/data/etc/android.hardware.camera.front.xml:system/etc/permissions/android.hardware.camera.front.xml \
+    frameworks/native/data/etc/android.hardware.camera.full.xml:system/etc/permissions/android.hardware.camera.full.xml\
+    frameworks/native/data/etc/android.hardware.camera.raw.xml:system/etc/permissions/android.hardware.camera.raw.xml\
     frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \
     frameworks/native/data/etc/android.hardware.bluetooth_le.xml:system/etc/permissions/android.hardware.bluetooth_le.xml \
 
@@ -58,7 +62,18 @@ PRODUCT_PACKAGES += \
     hwcomposer.msmcobalt \
     gralloc.msmcobalt \
     libbt-vendor \
-    lights.$(PRODUCT_HARDWARE) \
+    lights.$(PRODUCT_HARDWARE)
+
+PRODUCT_PACKAGES += \
+    libmm-omxcore \
+    libOmxCore
+
+PRODUCT_PACKAGES += \
+    camera.msmcobalt \
+    libqomx_core \
+    libmmjpeg_interface \
+    libmmcamera_interface
+
 
 # setup dalvik vm configs
 $(call inherit-product, frameworks/native/build/phone-xhdpi-2048-dalvik-heap.mk)