diff --git a/ChangeLog b/ChangeLog
index 3efb4ec2..8210d683 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,10 @@ Torben Hohn
   Jackdmp changes log
 ---------------------------
 
+2009-03-10 Stephane Letz  <letz@grame.fr>
+
+	* Add -g (ring-buffer) parameter to netadapter.
+
 2009-03-09 Stephane Letz  <letz@grame.fr>
 
 	* Use Torben Hohn PI controler code for adapters (in progress).
diff --git a/common/JackNetAdapter.cpp b/common/JackNetAdapter.cpp
index 21654c74..1fa2fff2 100644
--- a/common/JackNetAdapter.cpp
+++ b/common/JackNetAdapter.cpp
@@ -95,6 +95,9 @@ namespace Jack
                 case 'q':
                     fQuality = param->value.ui;
                     break;
+                case 'g':
+                    fRingbufferSize = param->value.ui;
+                    break;
              }
         }
 
@@ -390,7 +393,7 @@ extern "C"
         strcpy(desc->name, "netadapter");                              // size MUST be less then JACK_DRIVER_NAME_MAX + 1
         strcpy(desc->desc, "netjack net <==> audio backend adapter");  // size MUST be less then JACK_DRIVER_PARAM_DESC + 1
        
-        desc->nparams = 10;
+        desc->nparams = 11;
         desc->params = ( jack_driver_param_desc_t* ) calloc ( desc->nparams, sizeof ( jack_driver_param_desc_t ) );
 
         int i = 0;
@@ -418,7 +421,7 @@ extern "C"
         strcpy ( desc->params[i].long_desc, desc->params[i].short_desc );
 
         i++;
-        strcpy ( desc->params[i].name, "input_ports" );
+        strcpy ( desc->params[i].name, "input-ports" );
         desc->params[i].character = 'C';
         desc->params[i].type = JackDriverParamInt;
         desc->params[i].value.i = 2;
@@ -426,7 +429,7 @@ extern "C"
         strcpy ( desc->params[i].long_desc, desc->params[i].short_desc );
 
         i++;
-        strcpy ( desc->params[i].name, "output_ports" );
+        strcpy ( desc->params[i].name, "output-ports" );
         desc->params[i].character = 'P';
         desc->params[i].type = JackDriverParamInt;
         desc->params[i].value.i = 2;
@@ -434,7 +437,7 @@ extern "C"
         strcpy ( desc->params[i].long_desc, desc->params[i].short_desc );
 
         i++;
-        strcpy ( desc->params[i].name, "client_name" );
+        strcpy ( desc->params[i].name, "client-name" );
         desc->params[i].character = 'n';
         desc->params[i].type = JackDriverParamString;
         strcpy ( desc->params[i].value.str, "'hostname'" );
@@ -442,7 +445,7 @@ extern "C"
         strcpy ( desc->params[i].long_desc, desc->params[i].short_desc );
 
         i++;
-        strcpy ( desc->params[i].name, "transport_sync" );
+        strcpy ( desc->params[i].name, "transport-sync" );
         desc->params[i].character  = 't';
         desc->params[i].type = JackDriverParamUInt;
         desc->params[i].value.ui = 1U;
@@ -466,13 +469,21 @@ extern "C"
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
         
         i++;
-        strcpy ( desc->params[i].name, "auto_connect" );
+        strcpy(desc->params[i].name, "ring-buffer");
+        desc->params[i].character = 'g';
+        desc->params[i].type = JackDriverParamInt;
+        desc->params[i].value.ui = 0;
+        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 16384)");
+        strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
+        
+        i++;
+        strcpy ( desc->params[i].name, "auto-connect" );
         desc->params[i].character = 'c';
         desc->params[i].type = JackDriverParamBool;
         desc->params[i].value.i = false;
         strcpy ( desc->params[i].short_desc, "Auto connect netmaster to system ports" );
         strcpy ( desc->params[i].long_desc, desc->params[i].short_desc );
-
+    
         return desc;
     }
 
diff --git a/linux/alsa/JackAlsaAdapter.cpp b/linux/alsa/JackAlsaAdapter.cpp
index b12e4ccd..0e9fb4ce 100644
--- a/linux/alsa/JackAlsaAdapter.cpp
+++ b/linux/alsa/JackAlsaAdapter.cpp
@@ -287,7 +287,7 @@ extern "C"
         desc->params[i].character = 'g';
         desc->params[i].type = JackDriverParamInt;
         desc->params[i].value.ui = 0;
-        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 32768)");
+        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 16384)");
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
 
         return desc;
diff --git a/macosx/coreaudio/JackCoreAudioAdapter.cpp b/macosx/coreaudio/JackCoreAudioAdapter.cpp
index 18882f9b..dd238b7b 100644
--- a/macosx/coreaudio/JackCoreAudioAdapter.cpp
+++ b/macosx/coreaudio/JackCoreAudioAdapter.cpp
@@ -377,7 +377,7 @@ JackCoreAudioAdapter::JackCoreAudioAdapter(jack_nframes_t buffer_size, jack_nfra
                 fQuality = param->value.ui;
                 break;
                 
-             case 'g':
+            case 'g':
                 fRingbufferSize = param->value.ui;
                 break;
         }
@@ -1081,7 +1081,7 @@ extern "C"
         desc->params[i].character = 'g';
         desc->params[i].type = JackDriverParamInt;
         desc->params[i].value.ui = 0;
-        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 32768)");
+        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 16384)");
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
 
         return desc;
diff --git a/solaris/oss/JackOSSAdapter.cpp b/solaris/oss/JackOSSAdapter.cpp
index 69a59ec7..cbb3e549 100644
--- a/solaris/oss/JackOSSAdapter.cpp
+++ b/solaris/oss/JackOSSAdapter.cpp
@@ -743,7 +743,7 @@ extern "C"
         desc->params[i].character = 'g';
         desc->params[i].type = JackDriverParamInt;
         desc->params[i].value.ui = 0;
-        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 32768)");
+        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 16384)");
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
     
         return desc;
diff --git a/windows/portaudio/JackPortAudioAdapter.cpp b/windows/portaudio/JackPortAudioAdapter.cpp
index a5beb232..17972e6b 100644
--- a/windows/portaudio/JackPortAudioAdapter.cpp
+++ b/windows/portaudio/JackPortAudioAdapter.cpp
@@ -299,7 +299,7 @@ extern "C"
         desc->params[i].character = 'g';
         desc->params[i].type = JackDriverParamInt;
         desc->params[i].value.ui = 0;
-        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 32768)");
+        strcpy(desc->params[i].short_desc, "Resampling ringbuffer size in frames (default = 16384)");
         strcpy(desc->params[i].long_desc, desc->params[i].short_desc);
 
         return desc;