diff --git a/products/common.mk b/products/common.mk
index 1f56409..865512a 100644
--- a/products/common.mk
+++ b/products/common.mk
@@ -46,10 +46,6 @@
 PRODUCT_COPY_FILES += \
     vendor/cyanogen/CHANGELOG:system/etc/CHANGELOG-CM.txt
 
-# APN list
-PRODUCT_COPY_FILES += \
-    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
-
 # Common CM overlay
 PRODUCT_PACKAGE_OVERLAYS += vendor/cyanogen/overlay/common
 
diff --git a/products/cyanogen_bravo.mk b/products/cyanogen_bravo.mk
index 3836300..1a76fbc 100644
--- a/products/cyanogen_bravo.mk
+++ b/products/cyanogen_bravo.mk
@@ -1,6 +1,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/cyanogen_dream_sapphire.mk b/products/cyanogen_dream_sapphire.mk
index c1c9dc0..22664a0 100644
--- a/products/cyanogen_dream_sapphire.mk
+++ b/products/cyanogen_dream_sapphire.mk
@@ -4,6 +4,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
+# Include GSM-only stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/cyanogen_espresso.mk b/products/cyanogen_espresso.mk
index f807d4d..c41c461 100644
--- a/products/cyanogen_espresso.mk
+++ b/products/cyanogen_espresso.mk
@@ -4,6 +4,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/cyanogen_hero.mk b/products/cyanogen_hero.mk
index c0985e2..ff30996 100644
--- a/products/cyanogen_hero.mk
+++ b/products/cyanogen_hero.mk
@@ -4,6 +4,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/cyanogen_passion.mk b/products/cyanogen_passion.mk
index c249d9c..94009c7 100644
--- a/products/cyanogen_passion.mk
+++ b/products/cyanogen_passion.mk
@@ -4,6 +4,9 @@
 # Inherit some common cyanogenmod stuff.
 $(call inherit-product, vendor/cyanogen/products/common.mk)
 
+# Include GSM stuff
+$(call inherit-product, vendor/cyanogen/products/gsm.mk)
+
 #
 # Setup device specific product configuration.
 #
diff --git a/products/gsm.mk b/products/gsm.mk
new file mode 100644
index 0000000..8f21b28
--- /dev/null
+++ b/products/gsm.mk
@@ -0,0 +1,4 @@
+# GSM APN list
+PRODUCT_COPY_FILES += \
+    vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml
+