diff --git a/arm/Android.mk b/arm/Android.mk
index d23924d..5e18444 100644
--- a/arm/Android.mk
+++ b/arm/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_DEVICE),)
+ifneq ($(filter arm,$(TARGET_ARCH)),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
diff --git a/arm64/Android.mk b/arm64/Android.mk
index d23924d..a414b5e 100644
--- a/arm64/Android.mk
+++ b/arm64/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_DEVICE),)
+ifneq ($(filter arm64,$(TARGET_ARCH)),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := PrebuiltGmsCore
diff --git a/common/Android.mk b/common/Android.mk
index 6253fa1..b0d538e 100644
--- a/common/Android.mk
+++ b/common/Android.mk
@@ -16,7 +16,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_DEVICE),)
+ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := GoogleContactsSyncAdapter
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 1f77f46..3fb2da3 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -32,10 +32,10 @@ fi
 . "$HELPER"
 
 # Initialize the helper for common gapps
-setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT"
+setup_vendor "$GAPPS_COMMON" "$VENDOR" "$CM_ROOT" true
 
 # Copyright headers
-write_headers
+write_headers "arm arm64 x86"
 
 # Common gapps
 write_makefiles "$MY_DIR"/common-proprietary-files.txt
@@ -44,10 +44,10 @@ write_makefiles "$MY_DIR"/common-proprietary-files.txt
 write_footers
 
 # Reinitialize the helper for target gapps
-setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT"
+setup_vendor "$TARGET" "$VENDOR" "$CM_ROOT" true
 
 # Copyright headers and guards
-write_headers
+write_headers "$TARGET"
 
 write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt
 write_makefiles "$MY_DIR"/proprietary-files.txt
@@ -57,4 +57,4 @@ printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)"
 # We are done with target
 write_footers
 
-for f in `find "$MY_DIR" -type f -name Android.mk`; do sed -i s/ifeq/ifneq/g $f; done
+for f in `find "$MY_DIR" -type f -name Android.mk`; do sed -i s/TARGET_DEVICE/TARGET_ARCH/g $f; done