diff --git a/clients/SConscript b/clients/SConscript
new file mode 100644
index 0000000..1894799
--- /dev/null
+++ b/clients/SConscript
@@ -0,0 +1,21 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL common bsdfsp client"))
+
+env.Program(target = 'fcatcmd',source=['fcatcmd.c']+client+common)
+env.Program(target = 'fcdcmd', source=['fcdcmd.c','printpro.c']+client+common)
+env.Program(target = 'fducmd', source=['fducmd.c']+client+common)
+env.Program(target = 'ffindcmd',source=['ffindcmd.c']+client+common+bsdfsp)
+fget=env.StaticObject('fgetcmd.c', CPPDEFINES='-DCOMMAND_GET')
+env.Program(target = 'fgetcmd',source=fget+client+common)
+env.Program(target = 'fgrab',source=['fgrabcmd.c']+client+common)
+env.Program(target = 'fhostcmd',source=['fhostcmd.c','fhost.c','fspprof.l'])
+env.Program(target = 'flscmd',source=['flscmd.c']+client+common+bsdfsp)
+env.Program(target = 'fmkdir',source=['fmkdir.c']+client+common)
+env.Program(target = 'fprocmd',source=['fprocmd.c','printpro.c']+client+common)
+env.Program(target = 'fput',source=['fput.c']+client+common)
+env.Program(target = 'frmcmd',source=['frmcmd.c']+client+common)
+env.Program(target = 'frmdircmd',source=['frmdircmd.c']+client+common)
+env.Program(target = 'fver',source=['fver.c']+client+common)
+env.Program(target = 'fstatcmd',source=['fstatcmd.c']+client+common)
+env.Program(target = 'fmvcmd',source=['fmvcmd.c']+client+common)
+env.Program(target = 'fbye',source=['fbye.c']+client+common)
+env.Program(target = 'fsetupcmd',source=['fsetupcmd.c','fspsites.l','fhost.c']+client+common)
diff --git a/tests/SConscript b/tests/SConscript
new file mode 100644
index 0000000..557ea9a
--- /dev/null
+++ b/tests/SConscript
@@ -0,0 +1,6 @@
+Import(Split("env PREFIX VERSION PACKAGE TARBALL"))
+
+env.Program(target = 'cachecheck', source = ['cachecheck.c','../server/fifocache.c'])
+env.Program(target = 'mklargefile', source = 'mklargefile.c')
+env.Program(target = 'parsecheck', source = ['parsecheck.c','../server/path.c'])
+env.Program(target = 'randomcheck', source = 'randomcheck.c')