diff --git a/.bzrignore b/.bzrignore
index 4262c9d..51d530c 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -23,6 +23,23 @@ clients/fspprof.c
 clients/fspsites.c
 clients/fstatcmd
 clients/fver
+clients/fbye_m.c
+clients/fcatcmd_m.c
+clients/fcdcmd_m.c
+clients/fducmd_m.c
+clients/ffindcmd_m.c
+clients/fgetcmd_m.c
+clients/fgrabcmd_m.c
+clients/fhostcmd_m.c
+clients/flscmd_m.c
+clients/fmkdir_m.c
+clients/fmvcmd_m.c
+clients/fprocmd_m.c
+clients/fput_m.c
+clients/frmcmd_m.c
+clients/frmdircmd_m.c
+clients/fstatcmd_m.c
+clients/fver_m.c
 contrib/fspscan
 doc/fsp-faq.html
 include/config.h
diff --git a/clients/SConscript b/clients/SConscript
index 5ae0baf..bbc27b5 100644
--- a/clients/SConscript
+++ b/clients/SConscript
@@ -1,5 +1,11 @@
 Import(Split("env PREFIX common bsdfsp client CLIENTS"))
 
+def createMergeSource(basename):
+    """Creates skeleton source file for compiling merge client."""
+    f=open(basename+"_m.c","w")
+    f.write('#include "%s.c"\n' % basename)
+    f.close()
+
 if CLIENTS:
     fcatcmd=env.Program(target = 'fcatcmd',source=['fcatcmd.c']+client+common)
     fcdcmd=env.Program(target = 'fcdcmd', source=['fcdcmd.c','printpro.c']+client+common)
@@ -21,9 +27,39 @@ if CLIENTS:
     fbyecmd=env.Program(target = 'fbye',source=['fbye.c']+client+common)
     fsetupcmd=env.Program(target = 'fsetupcmd',source=['fsetupcmd.c','fspsites.l','fhost.c']+client+common)
 
+    MERGED_SRC=[ 'fcatcmd','fcdcmd','fducmd','ffindcmd','fgetcmd','fgrabcmd',
+               'fhostcmd','flscmd','fmkdir','fprocmd','fput','frmcmd',
+	       'frmdircmd','fver','fstatcmd','fmvcmd','fbye']
+
+    for program in MERGED_SRC:
+	createMergeSource(program)
+
+    fcatcmd_m=env.StaticObject('fcatcmd_m.c', CPPDEFINES='-Dmain=fcatcmd_main')
+    fcdcmd_m =env.StaticObject('fcdcmd_m.c', CPPDEFINES='-Dmain=fcdcmd_main')
+    fducmd_m =env.StaticObject('fducmd_m.c', CPPDEFINES='-Dmain=fducmd_main')
+    ffindcmd_m=env.StaticObject('ffindcmd_m.c', CPPDEFINES='-Dmain=ffindcmd_main')
+    fgetcmd_m=env.StaticObject('fgetcmd_m.c', CPPDEFINES=['-Dmain=fgetcmd_main','-DCOMMAND_GET'])
+    fgrabcmd_m=env.StaticObject('fgrabcmd_m.c', CPPDEFINES='-Dmain=fgrabcmd_main')
+    fhostcmd_m=env.StaticObject('fhostcmd_m.c', CPPDEFINES='-Dmain=fhostcmd_main')
+    flscmd_m=env.StaticObject('flscmd_m.c', CPPDEFINES='-Dmain=flscmd_main')
+    fmkdir_m=env.StaticObject('fmkdir_m.c', CPPDEFINES='-Dmain=fmkdir_main')
+    fprocmd_m=env.StaticObject('fprocmd_m.c', CPPDEFINES='-Dmain=fprocmd_main')
+    fput_m=env.StaticObject('fput_m.c', CPPDEFINES='-Dmain=fput_main')
+    frmcmd_m=env.StaticObject('frmcmd_m.c', CPPDEFINES='-Dmain=frmcmd_main')
+    frmdircmd_m=env.StaticObject('frmdircmd_m.c', CPPDEFINES='-Dmain=frmdircmd_main')
+    fver_m=env.StaticObject('fver_m.c', CPPDEFINES='-Dmain=fver_main')
+    fstatcmd_m=env.StaticObject('fstatcmd_m.c', CPPDEFINES='-Dmain=fstatcmd_main')
+    fmvcmd_m=env.StaticObject('fmvcmd_m.c', CPPDEFINES='-Dmain=fmvcmd_main')
+    fbye_m=env.StaticObject('fbye_m.c', CPPDEFINES='-Dmain=fbye_main')
+    fspmerge=env.Program(target = 'fspmerge',source=['merge.c','printpro.c','fspprof.l','fhost.c']+
+    [fcatcmd_m, fcdcmd_m, fducmd_m, ffindcmd_m, fgetcmd_m, fgrabcmd_m,
+     fhostcmd_m, flscmd_m, fmkdir_m, fprocmd_m, fput_m, frmcmd_m,
+     frmdircmd_m, fver_m, fmvcmd_m, fstatcmd_m, fbye_m] + [
+     client, common, bsdfsp])
+
     PROGRAMS=[ fcatcmd, fcdcmd, fducmd, ffindcmd, fgetcmd, fgrabcmd, fhostcmd,
 	     flscmd, fmkdircmd, fprocmd, fputcmd, frmcmd, frmdircmd, fvercmd,
-	     fstatcmd, fmvcmd, fbyecmd, fsetupcmd ]
+	     fstatcmd, fmvcmd, fbyecmd, fsetupcmd, fspmerge ]
 
     for program in PROGRAMS:
 	env.Install(dir = PREFIX+'/bin', source = program)