diff --git a/tests/jack_server_control.cpp b/example-clients/jack_server_control.cpp
similarity index 99%
rename from tests/jack_server_control.cpp
rename to example-clients/jack_server_control.cpp
index 754f0506..9744ac15 100644
--- a/tests/jack_server_control.cpp
+++ b/example-clients/jack_server_control.cpp
@@ -14,7 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
 */
 
 #include <stdio.h>
diff --git a/example-clients/wscript b/example-clients/wscript
index 9b648c95..5aa8574a 100644
--- a/example-clients/wscript
+++ b/example-clients/wscript
@@ -19,6 +19,7 @@ example_programs = {
     'jack_evmon' : 'evmon.c',
     'jack_monitor_client' : 'monitor_client.c',
     'jack_thru' : 'thru_client.c',
+    'jack_server_control' : 'jack_server_control.cpp',
     }
 
 example_libs = {
@@ -55,10 +56,9 @@ def configure(conf):
     conf.env['BUILD_EXAMPLE_CLIENT_REC'] = conf.is_defined('HAVE_SNDFILE')
 
 def build(bld):
-
-   
     for example_program, example_program_source in example_programs.items():
-        prog = bld.create_obj('cc', 'program')
+        prog = bld.create_obj('cpp', 'program')
+        prog.features.append('cc')
         prog.includes = ['../common/jack', '../common']
         prog.source = example_program_source
         if bld.env()['IS_MACOSX']:
@@ -67,7 +67,10 @@ def build(bld):
             prog.env.append_value("LINKFLAGS", "")
         if bld.env()['IS_LINUX']:
             prog.uselib = 'RT'
-        prog.uselib_local = 'clientlib'
+        if example_program == 'jack_server_control':
+            prog.uselib_local = 'serverlib'
+        else:
+            prog.uselib_local = 'clientlib'              
         prog.target = example_program
    
     #if bld.env()['BUILD_EXAMPLE_CLIENT_TRANSPORT']
diff --git a/tests/wscript b/tests/wscript
index 1d429265..f834813b 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -8,7 +8,6 @@ test_programs = {
     'testSem': ['testSem.cpp'],
     'jack_test': ['jack_test.cpp'],
     'jack_cpu': ['jack_cpu.c'],
-    'jack_server_control': ['jack_server_control.cpp'],
     }
 
 def build(bld):
@@ -23,10 +22,7 @@ def build(bld):
             prog.env.append_value("CPPFLAGS", "-mmacosx-version-min=10.4 -arch i386 -arch ppc")
             #prog.env.append_value("LINKFLAGS", "-arch i386 -arch ppc")
 	    prog.env.append_value("LINKFLAGS", "")
-        if test_program == 'jack_server_control':
-             prog.uselib_local = 'serverlib'
-        else:
-             prog.uselib_local = 'clientlib'
+            prog.uselib_local = 'clientlib'
         prog.target = test_program
         #if test_program != 'jack_test':
         #    prog.inst_var = 0