diff --git a/device.mk b/device.mk
index 5376dad..f01000e 100644
--- a/device.mk
+++ b/device.mk
@@ -99,7 +99,7 @@
     device/samsung/manta/gps/gps.conf:system/etc/gps.conf \
     device/samsung/manta/gps/gpsd:system/vendor/bin/gpsd \
     device/samsung/manta/gps/gps.xml:system/vendor/etc/gps.xml \
-    device/samsung/manta/gps/gps.exynos5.so:system/lib/hw/gps.exynos5.so
+    device/samsung/manta/gps/gps.manta.so:system/lib/hw/gps.manta.so
 
 # NFC packages
 PRODUCT_PACKAGES += \
diff --git a/gps/gps.exynos5.so b/gps/gps.exynos5.so
deleted file mode 100755
index 7971a60..0000000
--- a/gps/gps.exynos5.so
+++ /dev/null
Binary files differ
diff --git a/gps/gps.manta.so b/gps/gps.manta.so
new file mode 100755
index 0000000..5ac125c
--- /dev/null
+++ b/gps/gps.manta.so
Binary files differ
diff --git a/gps/gps.xml b/gps/gps.xml
index 6c44bd1..c176563 100755
--- a/gps/gps.xml
+++ b/gps/gps.xml
@@ -7,7 +7,7 @@
        gpioNStdbyPath="/sys/class/gps/bcm475x/GPS_PWR_EN/value"
        gpioNResetPath="/sys/class/gps/bcm475x/GPS_nRST/value"
        gpioDelayMs="250"
-       acNvStoDir="/data/"
+       acNvStoDir="/data/gps/"
 
        acLogDirectory="/data/gps/log/"
 
diff --git a/gps/gpsd b/gps/gpsd
index 60fd800..7cec16e 100755
--- a/gps/gpsd
+++ b/gps/gpsd
Binary files differ
diff --git a/init.manta.rc b/init.manta.rc
index 7eecd29..b5c8f07 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -71,8 +71,8 @@
     chmod 0664 /sys/class/gps/bcm475x/GPS_PWR_EN/value
     chown root system /sys/class/gps/bcm475x/GPS_nRST/value
     chmod 0664 /sys/class/gps/bcm475x/GPS_nRST/value
-    mkdir /data/gps 771 system system
-    chown system system /data/gps
+    mkdir /data/gps 771 gps system
+    chown gps system /data/gps
 
 # NFC: create data/nfc for nv storage
     mkdir /data/nfc 770 nfc nfc
diff --git a/sepolicy/system_server.te b/sepolicy/system_server.te
index 85af733..54e9279 100644
--- a/sepolicy/system_server.te
+++ b/sepolicy/system_server.te
@@ -1,3 +1,4 @@
 # Label the .gps.interface.pipe.to_jni pipe with gps_data_file.
 type_transition system_server system_data_file:fifo_file gps_data_file ".gps.interface.pipe.to_jni";
 allow system_server gps_data_file:fifo_file create_file_perms;
+allow system_server gps_data_file:dir rw_dir_perms;