diff --git a/Android.mk b/Android.mk
index 2fd4ef8..3abf19d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,7 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),land)
+ifneq ($(filter land santoni,$(TARGET_DEVICE)),)
 
 include $(call all-makefiles-under,$(LOCAL_PATH))
 
diff --git a/gps/Android.mk b/gps/Android.mk
index 2498c3e..3eb8216 100644
--- a/gps/Android.mk
+++ b/gps/Android.mk
@@ -16,6 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifeq ($(TARGET_DEVICE),land)
+ifneq ($(filter land santoni,$(TARGET_DEVICE)),)
 include $(call all-subdir-makefiles,$(LOCAL_PATH))
 endif
diff --git a/setup-makefiles.sh b/setup-makefiles.sh
index 6d54ef5..bb54c4b 100755
--- a/setup-makefiles.sh
+++ b/setup-makefiles.sh
@@ -40,7 +40,7 @@ fi
 setup_vendor "$DEVICE_COMMON" "$VENDOR" "$CM_ROOT" true
 
 # Copyright headers and guards
-write_headers "land"
+write_headers "land santoni"
 
 # The standard common blobs
 write_makefiles "$MY_DIR"/proprietary-files-qc.txt