diff --git a/Common/APRSWriter.cpp b/Common/APRSWriter.cpp
index 3fab725..e109335 100644
--- a/Common/APRSWriter.cpp
+++ b/Common/APRSWriter.cpp
@@ -448,8 +448,13 @@ void CAPRSWriter::sendIdFramesMobile()
 	if (!::gps_waiting(&m_gpsdData, 0))
 		return;
 
+#if GPSD_API_MAJOR_VERSION >= 7
 	if (::gps_read(&m_gpsdData, NULL, 0) <= 0)
 		return;
+#else
+	if (::gps_read(&m_gpsdData) <= 0)
+		return;
+#endif
 
 	if (m_gpsdData.status != STATUS_FIX)
 		return;
@@ -464,7 +469,11 @@ void CAPRSWriter::sendIdFramesMobile()
 
 	float rawLatitude  = float(m_gpsdData.fix.latitude);
 	float rawLongitude = float(m_gpsdData.fix.longitude);
+#if GPSD_API_MAJOR_VERSION >= 9
 	float rawAltitude  = float(m_gpsdData.fix.altMSL);
+#else
+	float rawAltitude  = float(m_gpsdData.fix.altitude);
+#endif
 	float rawVelocity  = float(m_gpsdData.fix.speed);
 	float rawBearing   = float(m_gpsdData.fix.track);
 
diff --git a/Makefile b/Makefile
index b3d02ec..067f0b1 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ endif
 # Add -DDCS_LINK to the end of the CFLAGS line below to add DCS linking to StarNet
 # Add -DDEXTRA_LINK to the end of the CFLAGS line below to add DExtra linking to StarNet
 
-# Add -DUSE_GPS to the end of the CFLAGS line to enable the use of gpsd, and add -lgps to
+# Add -DUSE_GPSD to the end of the CFLAGS line to enable the use of gpsd, and add -lgps to
 # end of the LIBS line.
 
 DEBUGFLAGS     := -g -D_DEBUG