diff --git a/base-pre.mk b/base-pre.mk
new file mode 100644
index 0000000..6a317e4
--- /dev/null
+++ b/base-pre.mk
@@ -0,0 +1,3 @@
+#Use a more decent APN config
+PRODUCT_COPY_FILES += \
+	device/sample/etc/apns-full-conf.xml:system/etc/apns-conf.xml
diff --git a/generate.sh b/generate.sh
index 9a96623..a17905e 100644
--- a/generate.sh
+++ b/generate.sh
@@ -40,6 +40,7 @@ for part in a ab;do
 				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
 
 				cat > ${target}.mk << EOF
+\$(call inherit-product, device/phh/treble/base-pre.mk)
 include build/make/target/product/treble_common.mk
 \$(call inherit-product, device/phh/treble/base.mk)
 $apps_script