diff --git a/common/wscript b/common/wscript
index 6089ff81..46d7b12b 100644
--- a/common/wscript
+++ b/common/wscript
@@ -11,6 +11,8 @@ def configure(conf):
     if conf.is_defined('HAVE_SAMPLERATE'):
         conf.env['LIB_SAMPLERATE'] = ['samplerate']
 
+    conf.check_cfg(package='celt', atleast_version='0.5.0', args='--cflags --libs')
+
     conf.env['BUILD_ADAPTER'] = conf.is_defined('HAVE_SAMPLERATE')
 
 def create_jack_process_obj(bld, target, sources, uselib = None):
diff --git a/linux/wscript b/linux/wscript
index 8e12b8ad..adc3478b 100644
--- a/linux/wscript
+++ b/linux/wscript
@@ -15,7 +15,7 @@ def create_jack_driver_obj(bld, target, sources, uselib = None):
     driver = bld.new_task_gen('cxx', 'shlib')
     driver.features.append('cc')
     driver.env['shlib_PATTERN'] = 'jack_%s.so'
-    driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE']
+    driver.defines = ['HAVE_CONFIG_H','SERVER_SIDE', 'HAVE_PPOLL']
     driver.includes = ['.', '../linux', '../posix', '../common', '../common/jack', '../dbus']
     driver.target = target
     driver.source = sources
@@ -64,3 +64,8 @@ def build(bld):
     create_jack_driver_obj(bld, 'net', '../common/JackNetDriver.cpp')
 
     create_jack_driver_obj(bld, 'loopback', '../common/JackLoopbackDriver.cpp')
+
+    create_jack_driver_obj(bld, 'netone', [ '../common/JackNetOneDriver.cpp',
+		                            '../common/netjack.c',
+					    '../common/netjack_packet.c' ], "SAMPLERATE CELT" )
+
diff --git a/macosx/wscript b/macosx/wscript
index 843874bc..25ca9b3d 100644
--- a/macosx/wscript
+++ b/macosx/wscript
@@ -73,3 +73,6 @@ def build(bld):
 
     create_jack_driver_obj(bld, 'net', '../common/JackNetDriver.cpp')
 
+    create_jack_driver_obj(bld, 'netone', [ '../common/JackNetOneDriver.cpp',
+		                            '../common/netjack.c',
+					    '../common/netjack_packet.c' ], "SAMPLERATE CELT" )