diff --git a/ChangeLog b/ChangeLog
index 42688df..5f167ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Version 2.8.1b29 - Not Released yet
-
+        added scons command line argument without-fspscan=yes for building
+	  without fspscan
 Version 2.8.1b28 - 16 Aug 2019
 	Pull scons site Python 3 fixed from fsplib and fspclient projects
 	More scons with python 3 build fixes
diff --git a/INSTALL b/INSTALL
index 76572db..9439378 100644
--- a/INSTALL
+++ b/INSTALL
@@ -58,6 +58,7 @@ SCons command line options:
 	docdir=directory        where to put documentation.
 	                           Default prefix/share/doc/fsp
 	without-clients=yes     dont build and install client commands
+	without-fspscan=yes     dont build and install fspcan command
 	dsssl=directory		Look for DocBook DSSSL Stylesheets there
 
 Client utilities:
diff --git a/SConstruct b/SConstruct
index 2a8e6c5..5cc13f5 100644
--- a/SConstruct
+++ b/SConstruct
@@ -58,6 +58,7 @@ from mandir import checkForUserMandir
 from docdir import checkForUserDocdir
 from mandir import autodetectMandir
 from clients import checkForBuildingClients
+from fspscan import checkForBuildingFspscan
 from sysconfdir import checkForUserSysconfdir
 from largefiles import enableLargeFiles
 from jade import checkDSSSLProcessor
@@ -77,6 +78,7 @@ conf = Configure(env,{'checkForCCOption':checkForCCOption,
 		      'autodetectMandir':autodetectMandir,
 		      'checkForUserSysconfdir':checkForUserSysconfdir,
 		      'checkForBuildingClients':checkForBuildingClients,
+		      'checkForBuildingFspscan':checkForBuildingFspscan,
 		      'checkDSSSLProcessor':checkDSSSLProcessor,
 		      'findDocbookStylesheets':findDocbookStylesheets
 	 	      })
@@ -154,10 +156,11 @@ if EFENCE == True:
     EFENCE=conf.CheckLib("efence","EF_Abort")
 conf.checkForLamerPack()
 CLIENTS=conf.checkForBuildingClients()
+FSPSCAN=conf.checkForBuildingFspscan()
 conf.checkForClientTimeout()
 conf.Finish()
 
 env.Append(CPPFLAGS = "-DPACKAGE_VERSION=\\\""+VERSION+"\\\"")
 # process build rules
-Export( Split("env PREFIX MANDIR DOCDIR CLIENTS JADE DSSSL"))
+Export( Split("env PREFIX MANDIR DOCDIR CLIENTS FSPSCAN JADE DSSSL"))
 env.SConscript(dirs=Split("doc . bsd_src common server client clients contrib tests man"))
diff --git a/contrib/SConscript b/contrib/SConscript
index 336a8fc..5e4dd56 100644
--- a/contrib/SConscript
+++ b/contrib/SConscript
@@ -1,4 +1,5 @@
-Import(Split("env PREFIX"))
+Import(Split("env PREFIX FSPSCAN"))
 
-fspscan=env.Program(target = 'fspscan', source = 'fspscan.c')
-env.Install(dir=PREFIX+'/bin',source=fspscan)
+if FSPSCAN:
+  fspscan=env.Program(target = 'fspscan', source = 'fspscan.c')
+  env.Install(dir=PREFIX+'/bin',source=fspscan)
diff --git a/site_scons/fspscan.py b/site_scons/fspscan.py
new file mode 100644
index 0000000..a324285
--- /dev/null
+++ b/site_scons/fspscan.py
@@ -0,0 +1,23 @@
+#
+# SCons fspcan build requested tester
+#
+# Version 1.0
+# 23-Aug-2019
+#
+
+from SCons.Script import ARGUMENTS
+
+def checkForBuildingFspscan(conf):
+    """Check command line arguments if user requested to not build fspscan."""
+    conf.Message("Checking if we are building fspscan... ")
+    buildlamer=ARGUMENTS.get('without-fspscan', 0)
+    try:
+         buildlamer2=int(buildlamer)
+    except ValueError:
+         buildlamer2=None
+    if buildlamer2 == 1 or str(buildlamer).lower() == 'yes':
+        conf.Result(0)
+        return False
+    else:
+        conf.Result(1)
+        return True