diff --git a/science/gis/gpsd/actions.py b/science/gis/gpsd/actions.py
index c1c3a67ddb..072bca0dfd 100644
--- a/science/gis/gpsd/actions.py
+++ b/science/gis/gpsd/actions.py
@@ -8,33 +8,28 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 from pisi.actionsapi import get
-
-def setup():
-    shelltools.touch("%s/ChangeLog" % get.curDIR())
-    autotools.autoreconf("-fi")
-
-    autotools.configure("--disable-static \
-                         --disable-libQgpsmm \
-                         --enable-dbus")
-    
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
-
+from pisi.actionsapi import scons
+                                                                                                                                                  
+shelltools.export("PYTHONDONTWRITEBYTECODE", "1")
 
 def build():
-    autotools.make()
+    scons.make( "prefix=/usr \
+                 systemd=no \
+                 libQgpsmm=no \
+                 PYTHONPATH=/usr/bin/python")
 
 def install():
-    autotools.install()
+    scons.install("--install-sandbox=%s" % get.installDIR())
 
     # We're using conf.d instead of sysconfig
-    pisitools.dosed("gpsd.hotplug.wrapper", "sysconfig\/", "conf.d/")
+    #pisitools.dosed("gpsd.hotplug.wrapper", "sysconfig\/", "conf.d/")
 
     # Install UDEV files
     pisitools.insinto("/lib/udev/rules.d", "gpsd.rules", "99-gpsd.rules")
     pisitools.dobin("gpsd.hotplug", "/lib/udev")
-    pisitools.dobin("gpsd.hotplug.wrapper", "/lib/udev")
+    #pisitools.dobin("gpsd.hotplug.wrapper", "/lib/udev")
 
     # Fix permissions
-    shelltools.chmod("%s/usr/lib/%s/site-packages/gps/gps.py" % (get.installDIR(), get.curPYTHON()))
+    #lsshelltools.chmod("%s/usr/lib/%s/site-packages/gps/gps.py" % (get.installDIR(), get.curPYTHON()))
 
     pisitools.dodoc("README", "TODO", "AUTHORS", "COPYING")
diff --git a/science/gis/gpsd/actions.py.old b/science/gis/gpsd/actions.py.old
new file mode 100644
index 0000000000..c1c3a67ddb
--- /dev/null
+++ b/science/gis/gpsd/actions.py.old
@@ -0,0 +1,40 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+def setup():
+    shelltools.touch("%s/ChangeLog" % get.curDIR())
+    autotools.autoreconf("-fi")
+
+    autotools.configure("--disable-static \
+                         --disable-libQgpsmm \
+                         --enable-dbus")
+    
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+
+
+def build():
+    autotools.make()
+
+def install():
+    autotools.install()
+
+    # We're using conf.d instead of sysconfig
+    pisitools.dosed("gpsd.hotplug.wrapper", "sysconfig\/", "conf.d/")
+
+    # Install UDEV files
+    pisitools.insinto("/lib/udev/rules.d", "gpsd.rules", "99-gpsd.rules")
+    pisitools.dobin("gpsd.hotplug", "/lib/udev")
+    pisitools.dobin("gpsd.hotplug.wrapper", "/lib/udev")
+
+    # Fix permissions
+    shelltools.chmod("%s/usr/lib/%s/site-packages/gps/gps.py" % (get.installDIR(), get.curPYTHON()))
+
+    pisitools.dodoc("README", "TODO", "AUTHORS", "COPYING")
diff --git a/science/gis/gpsd/pspec.xml b/science/gis/gpsd/pspec.xml
index 1714860c32..04f3180b02 100644
--- a/science/gis/gpsd/pspec.xml
+++ b/science/gis/gpsd/pspec.xml
@@ -3,7 +3,7 @@
 <PISI>
     <Source>
         <Name>gpsd</Name>
-        <Homepage>http://gpsd.berlios.de</Homepage>
+        <Homepage>http://catb.org/gpsd/</Homepage>
         <Packager>
             <Name>PisiLinux Community</Name>
             <Email>admins@pisilinux.org</Email>
@@ -11,15 +11,25 @@
         <License>BSD</License>
         <Summary>GPS daemon and library to support serial/USB GPS devices</Summary>
         <Description>gpsd is a service daemon that monitor one or more GPSes attached to a host computer through serial or USB ports, making all data of the sensors available to be queried on TCP port 2947 of the host computer.</Description>
-        <Archive sha1sum="af1f575c8ec3a2db7a71c35f2296fd339a4a1ff3" type="targz">http://www.openadk.org/distfiles/gpsd-2.95.tar.gz</Archive>
+        <Archive sha1sum="75ec3578e91815f0ac69a0ad79c8e47a23d8ac85" type="targz">http://download.savannah.gnu.org/releases/gpsd/gpsd-3.15.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>xmlto</Dependency>
+            <Dependency>libusb-devel</Dependency>
+            <Dependency>desktop-file-utils</Dependency>
+            <Dependency>ncurses-devel</Dependency>
+            <Dependency>python-devel</Dependency>
+            <Dependency>dbus-devel</Dependency>
+            <Dependency>bluez-libs-devel</Dependency>
+            <Dependency>util-linux</Dependency>
+            <Dependency>libxslt</Dependency>
+            <Dependency>scons</Dependency>
+            <Dependency>docbook-xsl</Dependency>
         </BuildDependencies>
-        <Patches>
+        <!--<Patches>
             <Patch level="1">gpsd-2.95-hotplugvars.patch</Patch>
             <Patch level="1">gpsd-2.95-silentmake.patch</Patch>
             <Patch level="1">fix-libusb-linking.patch</Patch>
-        </Patches>
+        </Patches>-->
     </Source>
 
     <Package>
@@ -45,7 +55,7 @@
         </Provides>
     </Package>
 
-    <Package>
+    <!--<Package>
         <Name>gpsd-clients</Name>
         <Icon>gpsd-logo</Icon>
         <IsA>app:console</IsA>
@@ -80,9 +90,9 @@
             <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/xgps.desktop">data/xgps.desktop</AdditionalFile>
             <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/xgpsspeed.desktop">data/xgpsspeed.desktop</AdditionalFile>
         </AdditionalFiles>
-    </Package>
+    </Package>-->
 
-    <Package>
+    <!--<Package>
         <Name>gpsd-devel</Name>
         <Summary>Development files for gpsd</Summary>
         <RuntimeDependencies>
@@ -96,9 +106,16 @@
             <Path fileType="man">/usr/share/man/man3</Path>
             <Path fileType="man">/usr/share/man/man1/gpsfake.1*</Path>
         </Files>
-    </Package>
+     </Package>-->
 
     <History>
+        <Update release="7">
+            <Date>2015-07-09</Date>
+            <Version>3.15</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2014-09-13</Date>
             <Version>2.95</Version>