diff --git a/ChangeLog b/ChangeLog
index ea663cf3..4cfce2a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,49 +24,53 @@ Paul Davis
 ---------------------------
   Jackdmp changes log
 ---------------------------
-
+
+2009-06-17 Stephane Letz  <letz@grame.fr>
+
+	* Move DBus based audio device reservation code in ALSA backend compilation.
+
 2009-06-16 Stephane Letz  <letz@grame.fr>
 
-	* Correct JackFifo::TimedWait for EINTR handling.
-
+	* Correct JackFifo::TimedWait for EINTR handling.
+
 2009-06-05 Stephane Letz  <letz@grame.fr>
 
-	* Correct jack_set_error_function, jack_set_info_function and jack_set_thread_creator functions.
-
+	* Correct jack_set_error_function, jack_set_info_function and jack_set_thread_creator functions.
+
 2009-05-18 Stephane Letz  <letz@grame.fr>
 
-	* Correct wcsript files to create jackdbus only (and not create jackd anymore) when compiled in --dbus mode, add a --classic option. Both options are possible but issue a warning.
-
+	* Correct wcsript files to create jackdbus only (and not create jackd anymore) when compiled in --dbus mode, add a --classic option. Both options are possible but issue a warning.
+
 2009-05-15 Stephane Letz  <letz@grame.fr>
 
-	* Move InitFrameTime in JackDriver::Start method.
-
+	* Move InitFrameTime in JackDriver::Start method.
+
 2009-05-13 Stephane Letz  <letz@grame.fr>
 
-	* Reworked Torben Hohn fix for server restart issue on Windows.
-
+	* Reworked Torben Hohn fix for server restart issue on Windows.
+
 2009-05-11 Stephane Letz  <letz@grame.fr>
 
-	* New jack_free function added in jack.h.
-	* Torben Hohn fix for InitTime and GetMicroSeconds in JackWinTime.c.
-
+	* New jack_free function added in jack.h.
+	* Torben Hohn fix for InitTime and GetMicroSeconds in JackWinTime.c.
+
 2009-05-07 Stephane Letz  <letz@grame.fr>
 
-	* Cleanup "loopback" stuff in server.
-
+	* Cleanup "loopback" stuff in server.
+
 2009-05-06 Stephane Letz  <letz@grame.fr>
 
-	* Fix transport callback (timebase master, sync) issue when used after jack_activate (RT thread was not running).
+	* Fix transport callback (timebase master, sync) issue when used after jack_activate (RT thread was not running).
 	* D-Bus access for jackctl_server_add_slave/jackctl_server_remove_slave API.
-
+
 2009-05-05 Stephane Letz  <letz@grame.fr>
 
 	* First working version of native MIDI backend (JackCoreMidiDriver, JackWinMMEDriver).
-
+
 2009-04-22 Stephane Letz  <letz@grame.fr>
 
 	* jackctl_server_load_master renamed to jackctl_server_switch_master, jackctl_server_unload_master is removed.
-
+
 2009-04-21 Stephane Letz  <letz@grame.fr>
 
 	* Add jackctl_server_load_master/jackctl_server_unload_master API.
diff --git a/common/wscript b/common/wscript
index b70ef8d3..2d491e75 100644
--- a/common/wscript
+++ b/common/wscript
@@ -141,9 +141,6 @@ def build(bld):
             '../posix/JackSocketServerNotifyChannel.cpp',
             '../posix/JackNetUnixSocket.cpp',
             ]
-	    
-    if bld.env['IS_LINUX'] and bld.env['BUILD_JACKDBUS']:
-	serverlib.source += ['../dbus/reserve.c', '../dbus/audio_reserve.c']
 
     if bld.env['IS_SUN']:
         serverlib.source += [
diff --git a/linux/wscript b/linux/wscript
index b9383b16..966a8ddf 100644
--- a/linux/wscript
+++ b/linux/wscript
@@ -36,18 +36,24 @@ def build(bld):
         jackd.target = 'jackd'
 
     create_jack_driver_obj(bld, 'dummy', '../common/JackDummyDriver.cpp')
+    
+    alsa_driver_src = ['alsa/JackAlsaDriver.cpp',
+                       'alsa/alsa_rawmidi.c',
+                       'alsa/alsa_seqmidi.c',
+                       'alsa/alsa_midi_jackmp.cpp',
+                       '../common/memops.c',
+                       'alsa/generic_hw.c',
+                       'alsa/hdsp.c',
+                       'alsa/hammerfall.c',
+                       'alsa/ice1712.c'
+                       ]
+		       
+    if bld.env['BUILD_JACKDBUS']:
+	alsa_driver_src += ['../dbus/reserve.c', '../dbus/audio_reserve.c']
+		       
 
     if bld.env['BUILD_DRIVER_ALSA'] == True:
-        create_jack_driver_obj(bld, 'alsa', ['alsa/JackAlsaDriver.cpp',
-                                             'alsa/alsa_rawmidi.c',
-                                             'alsa/alsa_seqmidi.c',
-                                             'alsa/alsa_midi_jackmp.cpp',
-                                             '../common/memops.c',
-                                             'alsa/generic_hw.c',
-                                             'alsa/hdsp.c',
-                                             'alsa/hammerfall.c',
-                                             'alsa/ice1712.c'
-                                             ], "ALSA")
+        create_jack_driver_obj(bld, 'alsa', alsa_driver_src, "ALSA")
 
     if bld.env['BUILD_DRIVER_FREEBOB'] == True:
         create_jack_driver_obj(bld, 'freebob', 'freebob/JackFreebobDriver.cpp', "LIBFREEBOB")
diff --git a/wscript b/wscript
index 5ba6a9c5..c0499682 100644
--- a/wscript
+++ b/wscript
@@ -68,8 +68,6 @@ def set_options(opt):
     opt.add_option('--mixed', action='store_true', default=False, help='Build with 32/64 bits mixed mode')
     opt.add_option('--clients', default=64, type="int", dest="clients", help='Maximum number of JACK clients')
     opt.add_option('--ports', default=1024, type="int", dest="ports", help='Maximum number of ports')
-    opt.add_option('--clients', default=64, type="int", dest="clients", help='Maximum number of JACK clients')
-    opt.add_option('--ports', default=1024, type="int", dest="ports", help='Maximum number of ports')
     opt.sub_options('dbus')
 
 def configure(conf):