diff --git a/p1-common/p1-common-vendor-blobs.mk b/p1-common/p1-common-vendor-blobs.mk
index a7915bf591..2eb4a0b54a 100644
--- a/p1-common/p1-common-vendor-blobs.mk
+++ b/p1-common/p1-common-vendor-blobs.mk
@@ -14,8 +14,6 @@
 
 # GPS
 PRODUCT_COPY_FILES += \
-    vendor/samsung/p1-common/proprietary/gps.s5pc110.so:system/lib/hw/gps.s5pc110.so \
-    vendor/samsung/p1-common/proprietary/gpsd:system/vendor/bin/gpsd \
     vendor/samsung/p1-common/proprietary/gps.conf:system/etc/gps.conf
 
 # Sensors
@@ -79,6 +77,7 @@ PRODUCT_COPY_FILES += \
 
 # TVout
 PRODUCT_COPY_FILES += \
+    vendor/samsung/p1-common/proprietary/libddc.so:system/lib/libddc.so \
     vendor/samsung/p1-common/proprietary/libedid.so:system/lib/libedid.so \
     vendor/samsung/p1-common/proprietary/libtvout.so:system/lib/libtvout.so \
     vendor/samsung/p1-common/proprietary/lib_tvoutengine.so:system/lib/lib_tvoutengine.so \
diff --git a/p1/p1-vendor-blobs.mk b/p1/p1-vendor-blobs.mk
index 24766a531f..621bfb84b5 100644
--- a/p1/p1-vendor-blobs.mk
+++ b/p1/p1-vendor-blobs.mk
@@ -24,3 +24,9 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/p1/proprietary/libsec-ril.so:system/lib/libsec-ril.so \
     vendor/samsung/p1/proprietary/rild:system/bin/rild \
     vendor/samsung/p1/proprietary/modem.bin:modem.bin
+
+# GPS (GSM)
+PRODUCT_COPY_FILES += \
+    vendor/samsung/p1/proprietary/gps.s5pc110.so:system/lib/hw/gps.s5pc110.so \
+    vendor/samsung/p1/proprietary/gps.xml:system/vendor/etc/gps.xml \
+    vendor/samsung/p1/proprietary/gpsd:system/vendor/bin/gpsd
diff --git a/p1/proprietary/gps.s5pc110.so b/p1/proprietary/gps.s5pc110.so
new file mode 100644
index 0000000000..bfc4bdc634
Binary files /dev/null and b/p1/proprietary/gps.s5pc110.so differ
diff --git a/p1/proprietary/gps.xml b/p1/proprietary/gps.xml
new file mode 100644
index 0000000000..15b7cc6b72
--- /dev/null
+++ b/p1/proprietary/gps.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+  <!--HAL Confguration  -->
+  <hal 
+	   acPortName="/dev/s3c2410_serial1" lBaudRate="115200"  cLogEnabled="false" cLogEnableInitState="false" acLogDirectory="/data/gps/log/" ltoFileName="lto2.dat" 
+       enhanced-assisted="false" cp-enhanced-assisted="true" TISEnabled="false" RILEnabled="true" LPmode="false" cp-cold-start="false" cp-guard-time-sec="2"
+       arp-supl-enable="true" arp-supl-cap-msb="true" arp-supl-cap-msa="true" arp-supl-cap-ecid="false"
+	   acSuplServer="supl.google.com" SuplPort="7276"
+       LbsEnable="true" LbsLocal="false" LbsServer="bcmls2.glpals.com" LbsPort="7275" LbsSyncLto="true" LbsSyncCells="true" LbsWlanEnable="false"       
+       LbsSyncLtoThresholdDays="3"
+       gpioNStdbyPath="/sys/class/sec/gps/GPS_PWR_EN/value"
+       gpioNResetPath="/sys/class/sec/gps/GPS_nRST/value"
+       gpioDelayMs="250"
+       lcsApiSockName="/dev/socket/gps"
+       acNvStoDir="/data/gps/"
+       />
+
+  <!-- Parameters passed to GlEngine   -->
+  <!--gll
+         LogPriMask="LOG_DEBUG"
+         LogFacMask="LOG_GLLAPI | LOG_DEVIA | LOG_NMEA | LOG_RAWDATA | LOG_DEVMS | LOG_ASIC_IO | LOG_BBTEST | LOG_DEVET | LOG_MESM | LOG_DEVKF | LOG_DEVJG | LOG_DEVMR" 
+         FrqPlan="FRQ_PLAN_10MHZ_2PPM_10MHZ_100PPB" FrqPlan="FRQ_PLAN_10MHZ_2PPM" "FRQ_PLAN_16_8MHZ_2PPM"
+         RfType="GL_RF_PALS7" "GL_RF_BARRACUDA" "GL_RF_2075_LN22" "GL_RF_2075_BRCM" "GL_RF_PALS7_BRCM" "GL_RF_BARRACUDA_BRCM" "GL_RF_BARRACUDA_EXT_LNA"
+         NOTE: "GL_RF_BARRACUDA_EXT_LNA" should be used for BAS
+         LbsEnable="true" LbsLocal="true" LbsServer="bcmlbsqa1.glpals.com" LbsPort="7275" LbsSyncTimeSec = "60" LbsSyncLto="true" LbsSyncCells="true"
+  /-->
+
+  <!-- NOTE: BrcmRFwildBase, BrcmRFclkDiv, anBrcmRFclkRefHz only needed for Broadcom RF front end test chips
+            ( i.e. GL_RF_2075_BRCM and GL_RF_PALS7_BRCM ) -->
+
+  <gll 
+       LogPriMask="LOG_DEBUG"
+       LogFacMask="LOG_GLLAPI | LOG_DEVIA | LOG_NMEA | LOG_RAWDATA | LOG_DEVMS | LOG_ASIC_IO | LOG_BBTEST | LOG_DEVET | LOG_MESM | LOG_DEVKF | LOG_DEVJG | LOG_DEVMR" 
+       FrqPlan="FRQ_PLAN_26MHZ_2PPM_26MHZ_300PPB"   
+       RfType="GL_RF_4751_DANUBE_EXT_LNA"
+       WarmStandbyTimeout1Seconds="5"
+       WarmStandbyTimeout2Seconds="10"       
+    >   
+  </gll>
+</glgps>
diff --git a/p1/proprietary/gpsd b/p1/proprietary/gpsd
new file mode 100644
index 0000000000..018aa77617
Binary files /dev/null and b/p1/proprietary/gpsd differ
diff --git a/p1c/p1c-vendor-blobs.mk b/p1c/p1c-vendor-blobs.mk
index 1147e3872e..16df2edb98 100644
--- a/p1c/p1c-vendor-blobs.mk
+++ b/p1c/p1c-vendor-blobs.mk
@@ -24,3 +24,8 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/p1c/proprietary/libsec-ril40.so:system/lib/libsec-ril40.so \
     vendor/samsung/p1c/proprietary/rild:system/bin/rild \
     vendor/samsung/p1c/proprietary/pppd_runner:system/bin/pppd_runner
+
+# GPS (CDMA)
+PRODUCT_COPY_FILES += \
+    vendor/samsung/p1c/proprietary/gps.s5pc110.so:system/lib/hw/gps.s5pc110.so \
+    vendor/samsung/p1c/proprietary/gpsd:system/vendor/bin/gpsd
diff --git a/p1-common/proprietary/gps.s5pc110.so b/p1c/proprietary/gps.s5pc110.so
similarity index 100%
rename from p1-common/proprietary/gps.s5pc110.so
rename to p1c/proprietary/gps.s5pc110.so
diff --git a/p1-common/proprietary/gpsd b/p1c/proprietary/gpsd
similarity index 100%
rename from p1-common/proprietary/gpsd
rename to p1c/proprietary/gpsd