diff --git a/SConscript b/SConscript
new file mode 100644
index 0000000..1b68e3b
--- /dev/null
+++ b/SConscript
@@ -0,0 +1,19 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+
+# *************** Targets ****************
+
+#Add install target
+env.Alias("install",[ PREFIX+'/bin', PREFIX+'/man'] )
+
+#Add build target
+env.Alias("build", Split('server/fspd clients/ contrib/') )
+
+#Change default target to build
+env.Default(None)
+env.Default("build")
+
+#Add dist target
+env.Replace(TARFLAGS = '-c -z')
+env.Alias("dist",TARBALL)
+#Clean tarball when doing build clean
+env.Clean("build",TARBALL)
diff --git a/SConstruct b/SConstruct
new file mode 100644
index 0000000..eef1c24
--- /dev/null
+++ b/SConstruct
@@ -0,0 +1,129 @@
+# Process this file with http://www.scons.org to build FSP
+
+# init Scons
+EnsureSConsVersion(0,96)
+PREFIX='/usr/local'
+PACKAGE='fsp'
+VERSION='2.8.1b24'
+
+env = Environment(CPPPATH='#/include')
+# Turn CPPFLAGS to list
+env.Append( CPPFLAGS = [])
+
+#################### Tests ###################
+
+# check for other GCC options
+def checkForGCCOption(conf,option):
+   if not conf.env['CC'].startswith('gcc'):
+       return 0
+   conf.Message("checking whether GCC supports "+option+" ")
+   lastCFLAGS=conf.env['CCFLAGS']
+   conf.env.Append(CCFLAGS = option)
+   rc = conf.TryCompile("""
+void dummy(void);
+void dummy(void) {}
+""",'.c')
+   if not rc:
+       conf.env.Replace(CCFLAGS = lastCFLAGS)
+   conf.Result(rc)
+   return rc
+
+# check for maintainer mode
+def checkForMaintainerMode(conf):
+    conf.Message("checking whether to enable maintainer mode... ")
+    if ARGUMENTS.get('maintainer-mode', 0) or \
+       ARGUMENTS.get('enable-maintainer-mode', 0):
+			  conf.Result(1)
+			  conf.env.Append(CCFLAGS = '-O0')
+			  conf.env.Append(CPPFLAGS = '-DMAINTAINER_MODE')
+    else:
+			  conf.env.Append(CCFLAGS = '-O')
+			  conf.Result(0)
+
+# check for user-supplied lock prefix
+def checkForLockPrefix(conf):
+    conf.Message("checking for user supplied lockprefix... ")
+    lp = ARGUMENTS.get('lockprefix', 0) or ARGUMENTS.get("with-lockprefix",0)
+
+    if lp:
+			  conf.Result(1)
+			  conf.env.Append(CPPFLAGS = '-DFSP_KEY_PREFIX=\\"'+lp+'\\"')
+    else:
+			  conf.Result(0)
+
+# check for user-supplied prefix
+def checkForUserPrefix(conf):
+    global PREFIX
+    conf.Message("checking for user supplied prefix... ")
+    lp = ARGUMENTS.get('prefix', 0)
+    if lp:
+			  conf.Result(1)
+			  PREFIX=lp
+    else:
+			  conf.Result(0)
+
+############  Start configuration ##############
+conf = Configure(env,{'checkForGCCOption':checkForGCCOption,
+                      'MAINTAINER_MODE':checkForMaintainerMode,
+		      'checkForLockPrefix':checkForLockPrefix,
+		      'checkPrefix':checkForUserPrefix
+		      })
+#check for GCC options
+for option in Split("""
+      -Wall -W -Wstrict-prototypes -Wmissing-prototypes -Wshadow
+      -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings
+      -Waggregate-return -Wmissing-declarations
+      -Wmissing-format-attribute -Wnested-externs
+      -ggdb -fno-common -Wchar-subscripts -Wcomment
+      -Wimplicit -Wsequence-point -Wreturn-type
+      -Wfloat-equal -Wno-system-headers -Wredundant-decls
+      -Wmissing-noreturn -pedantic
+      -Wlong-long -Wundef -Winline
+      -Wpointer-arith -Wno-unused-parameter
+      -Wunreachable-code
+"""):
+       conf.checkForGCCOption(option)
+#portability build time config
+if conf.CheckFunc('srandomdev'):
+    conf.env.Append(CPPFLAGS = '-DHAVE_SRANDOMDEV')
+#check for available locking methods
+if not conf.CheckType("union semun", "#include <sys/types.h>\n#include <sys/ipc.h>\n#include <sys/sem.h>",'c'):
+       conf.env.Append(CPPFLAGS = "-D_SEM_SEMUN_UNDEFINED=1")
+fun_lockf=conf.CheckFunc("lockf")
+fun_semop=conf.CheckFunc("semop")
+fun_shmget=conf.CheckFunc("shmget")
+fun_flock=conf.CheckFunc("flock")
+#select locking type
+lt=ARGUMENTS.get('locking', 0) or ARGUMENTS.get("with-locking",0) or ARGUMENTS.get("lock",0) or ARGUMENTS.get("with-lock",0)
+if lt == "none":
+    conf.env.Append(CPPFLAGS = '-DFSP_NOLOCKING')
+elif lt == "lockf" and fun_lockf:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_LOCKF')
+elif lt == "semop" and fun_semop and fun_shmget:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_SHAREMEM_AND_SEMOP')
+elif lt == "shmget" and fun_shmget and fun_lockf:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_SHAREMEM_AND_LOCKF')
+elif lt == "flock" and fun_flock:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_FLOCK')
+#AUTODETECT best available locking type    
+elif fun_semop and fun_shmget:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_SHAREMEM_AND_SEMOP')
+elif fun_shmget and fun_lockf:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_SHAREMEM_AND_LOCKF')
+elif fun_lockf:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_LOCKF')
+elif fun_flock:
+    conf.env.Append(CPPFLAGS = '-DFSP_USE_FLOCK')
+else:
+    conf.env.Append(CPPFLAGS = '-DFSP_NOLOCKING')
+conf.checkForLockPrefix()
+conf.checkPrefix()
+conf.MAINTAINER_MODE()
+conf.Finish()
+
+#configure globals
+TARBALL=PACKAGE+'-'+VERSION+'.tar.gz'
+env.Append(CPPFLAGS = "-DPACKAGE_VERSION=\\\""+VERSION+"\\\"")
+# process build rules
+Export( Split("env PREFIX PACKAGE VERSION TARBALL"))
+env.SConscript(dirs=Split('. bsd_src common server client clients contrib'))
diff --git a/bsd_src/SConscript b/bsd_src/SConscript
new file mode 100644
index 0000000..9b0ea06
--- /dev/null
+++ b/bsd_src/SConscript
@@ -0,0 +1,8 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+
+bsdfsp=env.StaticLibrary(target = 'bsdfsp', source = Split('''
+cmp.c fnmatch.c glob.c operator.c print.c
+find.c function.c ls.c  option.c  util.c
+'''))
+
+Export(Split("bsdfsp"))
diff --git a/client/SConscript b/client/SConscript
new file mode 100644
index 0000000..122621d
--- /dev/null
+++ b/client/SConscript
@@ -0,0 +1,7 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+
+client=env.StaticLibrary(target = 'client', source = Split('''
+lib.c  lock.c util.c
+'''))
+
+Export(Split("client"))
diff --git a/common/SConscript b/common/SConscript
new file mode 100644
index 0000000..28f7572
--- /dev/null
+++ b/common/SConscript
@@ -0,0 +1,7 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+
+common=env.StaticLibrary(target = 'common', source = Split('''
+random.c udp_io.c getsl.c
+'''))
+
+Export(Split("common"))
diff --git a/contrib/SConscript b/contrib/SConscript
new file mode 100644
index 0000000..327ad7f
--- /dev/null
+++ b/contrib/SConscript
@@ -0,0 +1,3 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+
+env.Program(target = 'fspscan', source = 'fspscan.c')
diff --git a/server/SConscript b/server/SConscript
new file mode 100644
index 0000000..b198aea
--- /dev/null
+++ b/server/SConscript
@@ -0,0 +1,7 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL common bsdfsp"))
+
+fspd=env.Program(target = 'fspd', source = Split('''
+acl.c       file.c      info.c      main.c      random.c
+conf.c      filecache.c iprange.c   path.c      server.c
+fifocache.c host.c      log.c       pidfile.c
+''') + common  + bsdfsp)