--- SConstruct.orig	Fri Jan  8 22:25:48 2016
+++ SConstruct	Fri Mar 11 20:19:33 2016
@@ -390,7 +390,7 @@ def CheckPKG(context, name):
     return ret
 
 # Stylesheet URLs for making HTML and man pages from DocBook XML.
-docbook_url_stem = 'http://docbook.sourceforge.net/release/xsl/current/'
+docbook_url_stem = '/usr/local/share/xsl/docbook/'
 docbook_man_uri = docbook_url_stem + 'manpages/docbook.xsl'
 docbook_html_uri = docbook_url_stem + 'html/docbook.xsl'
 
@@ -550,7 +550,7 @@ else:
         elif sys.platform.startswith('freebsd'):
             ncurseslibs= [ '-lncurses' ]
         elif sys.platform.startswith('openbsd'):
-            ncurseslibs= [ '-lcurses' ]
+            ncurseslibs= [ '-lncurses' ]
         elif sys.platform.startswith('darwin'):
             ncurseslibs= [ '-lcurses' ]
 
@@ -584,7 +584,7 @@ else:
 
     if env['dbus_export'] and config.CheckPKG('dbus-1'):
         confdefs.append("#define HAVE_DBUS 1\n")
-        dbusflags = ["-ldbus-1"]
+        dbusflags = pkg_config('dbus-1')
         env.MergeFlags(pkg_config("dbus-1"))
     else:
         confdefs.append("/* #undef HAVE_DBUS */\n")
@@ -823,7 +823,7 @@ int clock_gettime(clockid_t, struct timespec *);
 ## Two shared libraries provide most of the code for the C programs
 
 libgps_version_soname = libgps_version_current - libgps_version_age
-libgps_version = "%d.%d.%d" %(libgps_version_soname, libgps_version_age, libgps_version_revision)
+libgps_version = "%d.%d" %(libgps_version_soname, libgps_version_revision)
 
 libgps_sources = [
     "ais_json.c",
@@ -1134,7 +1134,7 @@ else:
             python_objects[ext].append(
                 python_env.NoCache(
                     python_env.SharedObject(
-                        src.split(".")[0] + '-py_' + '_'.join(['%s' %(x) for x in sys.version_info]) + so_ext, src
+                        src.split(".")[0] + so_ext, src
                     )
                 )
             )
@@ -1309,7 +1309,6 @@ python_manpages = {
     "gpscat.1" : "gpscat.xml",
     "xgpsspeed.1" : "gps.xml",
     "xgps.1" : "gps.xml",
-    "gegps.1" : "gps.xml",
     }
 
 manpage_targets = []