diff --git a/config/common.mk b/config/common.mk
index 0de8e5bb..39ac065c 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -61,6 +61,10 @@ PRODUCT_COPY_FILES +=  \
 PRODUCT_COPY_FILES += \
     frameworks/base/data/etc/android.software.sip.voip.xml:system/etc/permissions/android.software.sip.voip.xml
 
+# This is CM!
+PRODUCT_COPY_FILES += \
+    vendor/cm/config/permissions/com.cyanogenmod.android.xml:system/etc/permissions/com.cyanogenmod.android.xml
+
 # Don't export PS1 in /system/etc/mkshrc.
 PRODUCT_COPY_FILES += \
     vendor/cm/prebuilt/common/etc/mkshrc:system/etc/mkshrc
diff --git a/config/nfc_enhanced.mk b/config/nfc_enhanced.mk
new file mode 100644
index 00000000..d9ea1024
--- /dev/null
+++ b/config/nfc_enhanced.mk
@@ -0,0 +1,3 @@
+# This device supports CM enhanced NFC
+PRODUCT_COPY_FILES += \
+    vendor/cm/config/permissions/com.cyanogenmod.nfc.enhanced.xml:system/etc/permissions/com.cyanogenmod.nfc.enhanced.xml
diff --git a/config/permissions/com.cyanogenmod.android.xml b/config/permissions/com.cyanogenmod.android.xml
new file mode 100644
index 00000000..f5126c45
--- /dev/null
+++ b/config/permissions/com.cyanogenmod.android.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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 feature shows that this is CyanogenMod -->
+<permissions>
+    <feature name="com.cyanogenmod.android" />
+</permissions>
+
diff --git a/config/permissions/com.cyanogenmod.nfc.enhanced.xml b/config/permissions/com.cyanogenmod.nfc.enhanced.xml
new file mode 100644
index 00000000..4baa34de
--- /dev/null
+++ b/config/permissions/com.cyanogenmod.nfc.enhanced.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 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 feature shows that this is device features CM NFC enhancements -->
+<permissions>
+    <feature name="com.cyanogenmod.nfc.enhanced" />
+</permissions>
+