diff --git a/core/Makefile b/core/Makefile
index ac3e5f9..998cd08 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -193,6 +193,7 @@
 	$(hide) TARGET_BUILD_TYPE="$(TARGET_BUILD_VARIANT)" \
 			TARGET_BUILD_FLAVOR="$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" \
 			TARGET_DEVICE="$(TARGET_DEVICE)" \
+			CM_DEVICE="$(TARGET_DEVICE)" \
 			PRODUCT_NAME="$(TARGET_PRODUCT)" \
 			PRODUCT_BRAND="$(PRODUCT_BRAND)" \
 			PRODUCT_DEFAULT_LOCALE="$(call get-default-product-locale,$(PRODUCT_LOCALES))" \
diff --git a/tools/buildinfo.sh b/tools/buildinfo.sh
index 5c199b8..310d478 100755
--- a/tools/buildinfo.sh
+++ b/tools/buildinfo.sh
@@ -56,4 +56,6 @@
 fi
 echo "ro.build.characteristics=$TARGET_AAPT_CHARACTERISTICS"
 
+echo "ro.cm.device=$CM_DEVICE"
+
 echo "# end build properties"