diff --git a/ChangeLog b/ChangeLog
index 6dc53f53..152d3903 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,7 +23,8 @@ Paul Davis
 Peter L Jones
 Devin Anderson
 Josh Green
-Mario Lang
+Mario Lang
+Arnold Krille
 
 ---------------------------
   Jackdmp changes log
@@ -31,6 +32,8 @@ Mario Lang
 
 2010-03-06 Stephane Letz  <letz@grame.fr>
 
+	* Arnold Krille firewire patch.
+
 	* Raise JACK_DRIVER_PARAM_STRING_MAX and JACK_PARAM_STRING_MAX to 127 otherwise some audio drivers cannot be loaded on OSX.
 
 2010-03-04 Stephane Letz  <letz@grame.fr>
diff --git a/linux/firewire/JackFFADODriver.cpp b/linux/firewire/JackFFADODriver.cpp
index ab8d704c..7e679c55 100644
--- a/linux/firewire/JackFFADODriver.cpp
+++ b/linux/firewire/JackFFADODriver.cpp
@@ -753,12 +753,20 @@ extern "C"
         strcpy (desc->name, "firewire");                               // size MUST be less then JACK_DRIVER_NAME_MAX + 1
         strcpy(desc->desc, "Linux FFADO API based audio backend");     // size MUST be less then JACK_DRIVER_PARAM_DESC + 1
        
-        desc->nparams = 11;
+        desc->nparams = 12;
 
         params = (jack_driver_param_desc_t *)calloc (desc->nparams, sizeof (jack_driver_param_desc_t));
         desc->params = params;
 
         i = 0;
+        strcpy (params[i].name, "device");
+        params[i].character  = 'd';
+        params[i].type       = JackDriverParamString;
+        strcpy (params[i].value.str,  "hw:0");
+        strcpy (params[i].short_desc, "The FireWire device to use.");
+        strcpy (params[i].long_desc,  "The FireWire device to use. Please consult the FFADO documentation for more info.");
+
+        i++;
         strcpy (params[i].name, "period");
         params[i].character  = 'p';
         params[i].type       = JackDriverParamUInt;
@@ -881,7 +889,7 @@ extern "C"
 
             switch (param->character) {
                 case 'd':
-                    device_name = param->value.str;
+                    device_name = const_cast<char*>(param->value.str);
                     break;
                 case 'p':
                     cmlparams.period_size = param->value.ui;