diff --git a/functions/base.function b/functions/base.function
index e685a63..11d6e5e 100644
--- a/functions/base.function
+++ b/functions/base.function
@@ -45,10 +45,29 @@ HSTOOLS() {
 ################################
 GPS() {
     cd ${DIR} || return
-    wget --tries 2 --connect-timeout=60 https://raw.githubusercontent.com/km4ack/pi-scripts/master/gpsinstall
-    chmod +x ${DIR}/gpsinstall
-    sudo ${DIR}/gpsinstall
-    rm ${DIR}/gpsinstall
+
+    #old gpsd install left for reference
+    #wget --tries 2 --connect-timeout=60 https://raw.githubusercontent.com/km4ack/pi-scripts/master/gpsinstall
+    #chmod +x ${DIR}/gpsinstall
+    #sudo ${DIR}/gpsinstall
+    #rm ${DIR}/gpsinstall
+
+#begin gpsd change 11OCT2021 - see https://github.com/km4ack/pi-build/issues/316  
+    sudo apt-get -y install scons libncurses5-dev python-dev pps-tools chrony
+    sudo ldconfig
+    cd $HOME/Downloads
+    wget http://download.savannah.gnu.org/releases/gpsd/gpsd-3.23.1.tar.gz
+    tar -xzf gpsd-3.23.1.tar.gz
+    rm gpsd-3.23.1.tar.gz
+    cd gpsd-3.23.1/
+    scons prefix=/usr --config=force 
+    sudo scons udev-install
+    sudo ldconfig
+    sudo wget https://raw.githubusercontent.com/km4ack/pi-scripts/master/gpsd -P /etc/default/
+    sudo rm -rf gpsd-3.23.1/
+    echo "refclock SHM 0 offset 0.5 delay 0.2 refid NMEA" | sudo tee -a /etc/chrony/chrony.conf
+#end gpsd change 11OCT2021
+
     #Set GPS by serial ID
     #GPS Variable set by main script or update script
     #and placed in config file