diff --git a/workflow.install b/workflow.install
index 4976259..cc33def 100644
--- a/workflow.install
+++ b/workflow.install
@@ -318,55 +318,15 @@ function workflow_schema() {
 }
 
 /**
- * D6 and D7 are the only versions still under support.
+ * Require highest 6.x release.
  */
 function workflow_update_last_removed() {
-  return 5204;
+  return 6101;
 }
 
-// Add a general data field for storing workflow options.
-function workflow_update_6100() {
-  $ret = array();
-  db_add_field($ret, 'workflows', 'options', array('type' => 'text', 'size' => 'big', 'not null' => FALSE));
-  // Seed existing workflows with the behavior of showing the comment field.
-  $default = serialize(array('comment_log_node' => 1, 'comment_log_tab' => 1));
-  $query_result = db_query("UPDATE {workflows} SET options = '%s'", $default);
-  $ret[] = array('success' => $query_result !== FALSE, 'query' => "UPDATE {workflows} SET options = '$default'");
-  return $ret;
-}
-
-// Tables upgraded from 5.x needs AUTOINCREMENT set.
-function workflow_update_6101() {
-  $ret = array();
-  $workflows = $workflow_states = $workflow_transitions = FALSE;
-  // Test to see if the autoincrement attribute is present.
-  switch ($GLOBALS['db_type']) {
-    case 'mysqli':
-    case 'mysql':
-      $workflows = db_result(db_query("SHOW COLUMNS FROM {workflows} WHERE field = 'wid' and extra REGEXP 'auto_increment'"));
-      $workflow_states = db_result(db_query("SHOW COLUMNS FROM {workflow_states} WHERE field = 'sid' and extra REGEXP 'auto_increment'"));
-      $workflow_transitions = db_result(db_query("SHOW COLUMNS FROM {workflow_transitions} WHERE field = 'tid' and extra REGEXP 'auto_increment'"));
-      break;
-    case 'pgsql':
-      // Not sure how determine if a PostgreSQL field has a sequence.
-      break;
-  }
-  if ($workflows === FALSE) {
-    db_drop_primary_key($ret, 'workflows');
-    db_change_field($ret, 'workflows', 'wid', 'wid', array('type' => 'serial', 'not null' => TRUE), array('primary key' => array('wid')));
-  }
-  if ($workflow_states === FALSE) {
-    db_drop_primary_key($ret, 'workflow_states');
-    db_change_field($ret, 'workflow_states', 'sid', 'sid', array('type' => 'serial', 'not null' => TRUE), array('primary key' => array('sid')));
-  }
-  if ($workflow_transitions === FALSE) {
-    db_drop_primary_key($ret, 'workflow_transitions');
-    db_change_field($ret, 'workflow_transitions', 'tid', 'tid', array('type' => 'serial', 'not null' => TRUE), array('primary key' => array('tid')));
-  }
-  return $ret;
-}
-
-// Table update from 6 to 7. Adding a unique key for fields (already held unique in code).
+/**
+ * Table update from 6 to 7. Adding a unique key for fields (already held unique in code).
+ */
 function workflow_update_7000() {
   if (!db_index_exists('workflows', 'name')) {
     db_add_unique_key('workflows', 'name', array('name'));
@@ -375,3 +335,22 @@ function workflow_update_7000() {
     db_add_unique_key('workflow_states', 'wid_state', array('wid', 'state'));
   }
 }
+
+/**
+ * Initialize all workflows to show watchdog messages.
+ */
+function workflow_update_7001() {
+  // Get all workflows.
+  $workflows = workflow_get_workflows();
+  
+  foreach ($workflows as $workflow) {
+    // Add the option.
+    $workflow->options['watchdog_log'] = 1;
+    
+    // Serialize the options array.
+    $workflow->options = serialize($workflow->options);
+    
+    // Update the workflow without creating a creation state.
+    workflow_update_workflows($workflow, FALSE);
+  }
+}
diff --git a/workflow.module b/workflow.module
index d840818..cca4c16 100644
--- a/workflow.module
+++ b/workflow.module
@@ -797,12 +797,15 @@ function workflow_execute_transition($node, $sid, $comment = NULL, $force = FALS
   // Register state change with watchdog.
   $type = node_type_get_name($node->type);
   if ($state = workflow_get_workflow_states_by_sid($sid)) {
-    watchdog('workflow', 'State of @type %node_title set to %state_name',
-      array(
-        '@type' => $type,
-        '%node_title' => $node->title,
-        '%state_name' => t($state->state)),
-      WATCHDOG_NOTICE, l('view', 'node/' . $node->nid));
+    $workflow = workflow_get_workflows_by_wid($state->wid);
+    if ($workflow->options['watchdog_log']) {
+      watchdog('workflow', 'State of @type %node_title set to %state_name',
+        array(
+          '@type' => $type,
+          '%node_title' => $node->title,
+          '%state_name' => t($state->state)),
+        WATCHDOG_NOTICE, l('view', 'node/' . $node->nid));
+    }
   }
   // Notify modules that transition has occurred. Action triggers should take place in response to this callback, not the previous one.
   module_invoke_all('workflow', 'transition post', $old_sid, $sid, $node);
diff --git a/workflow_admin_ui/workflow_admin_ui.module b/workflow_admin_ui/workflow_admin_ui.module
index fbb2840..213a80f 100644
--- a/workflow_admin_ui/workflow_admin_ui.module
+++ b/workflow_admin_ui/workflow_admin_ui.module
@@ -362,6 +362,8 @@ function workflow_admin_ui_edit_form($form, $form_state, $workflow = NULL) {
   }
     // Create breadcrumbs.
     workflow_admin_ui_breadcrumbs($workflow);
+    
+    $noyes = array(t('No'), t('Yes'));
 
     $form['wid'] = array('#type' => 'value', '#value' => $workflow->wid);
     $form['#workflow'] = $workflow;
@@ -380,8 +382,10 @@ function workflow_admin_ui_edit_form($form, $form_state, $workflow = NULL) {
       );
 
     $form['basic']['name_as_title'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Use the workflow name as the title of the workflow form.'),
+      '#type' => 'radios',
+      '#options' => $noyes,
+      '#attributes' => array('class' => array('container-inline')),
+      '#title' => t('Use the workflow name as the title of the workflow form?'),
       '#default_value' => isset($workflow->options['name_as_title']) ? $workflow->options['name_as_title'] : 0,
       '#description' => t('The workflow section of the editing form is in its own fieldset. Checking the box will add the workflow ' .
         'name as the title of workflow section of the editing form.'),
@@ -393,20 +397,38 @@ function workflow_admin_ui_edit_form($form, $form_state, $workflow = NULL) {
       );
 
     $form['comment']['comment_log_node'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Show a comment field in the workflow section of the editing form.'),
+      '#type' => 'radios',
+      '#options' => $noyes,
+      '#attributes' => array('class' => array('container-inline')),
+      '#title' => t('Show a comment field in the workflow section of the editing form?'),
       '#default_value' => isset($workflow->options['comment_log_node']) ? $workflow->options['comment_log_node'] : 0,
       '#description' => t('On the node editing form, a Comment form can be shown so that the person making the state change can record ' .
         'reasons for doing so. The comment is then included in the node\'s workflow history.'),
       );
 
     $form['comment']['comment_log_tab'] = array(
-      '#type' => 'checkbox',
-      '#title' => t('Show a comment field in the workflow section of the workflow tab form.'),
+      '#type' => 'radios',
+      '#options' => $noyes,
+      '#attributes' => array('class' => array('container-inline')),
+      '#title' => t('Show a comment field in the workflow section of the workflow tab form?'),
       '#default_value' => isset($workflow->options['comment_log_tab']) ? $workflow->options['comment_log_tab'] : 0,
       '#description' => t('On the workflow tab, a Comment form can be shown so that the person making the state change can record ' .
         'reasons for doing so. The comment is then included in the node\'s workflow history.'),
       );
+      
+    $form['watchdog'] = array(
+      '#type' => 'fieldset',
+      '#title' => t('Watchdog Logging for Workflow'),
+      );
+
+    $form['watchdog']['watchdog_log'] = array(
+      '#type' => 'radios',
+      '#options' => $noyes,
+      '#attributes' => array('class' => array('container-inline')),
+      '#title' => t('Log informational watchdog messages when a transition is executed (state of a node is changed)?'),
+      '#default_value' => isset($workflow->options['watchdog_log']) ? $workflow->options['watchdog_log'] : 0,
+      '#description' => t('Optionally log transition state changes to watchdog.'),
+      );
 
     $form['tab'] = array(
       '#type' => 'fieldset',
@@ -488,6 +510,7 @@ function workflow_admin_ui_edit_form_submit($form, &$form_state) {
     'comment_log_node' => $form_state['values']['comment_log_node'],
     'comment_log_tab' => $form_state['values']['comment_log_tab'],
     'name_as_title' => $form_state['values']['name_as_title'],
+    'watchdog_log' => $form_state['values']['watchdog_log'],
     );
 
   $workflow = array(