diff --git a/commands/core/rsync.core.inc b/commands/core/rsync.core.inc
index eec5747..48a6a87 100644
--- a/commands/core/rsync.core.inc
+++ b/commands/core/rsync.core.inc
@@ -67,7 +67,7 @@ function drush_core_rsync($source, $destination, $additional_options = array())
         $options .= ' ' . $original_option;
       }
     }
-    
+
     // Go ahead and call rsync with the paths we determined
     return drush_core_exec_rsync($source_path, $destination_path, $options);
   }
@@ -98,7 +98,7 @@ function drush_core_rsync($source, $destination, $additional_options = array())
  *   TRUE on success, FALSE on failure.
  */
 function drush_core_call_rsync($source, $destination, $additional_options = array(), $include_settings_is_default = TRUE, $live_output = TRUE) {
-  $options = _drush_build_rsync_options($additional_options, $include_settings_is_default);  
+  $options = _drush_build_rsync_options($additional_options, $include_settings_is_default);
   return drush_core_exec_rsync($source, $destination, $options, $additional_options, $live_output);
 }
 
@@ -187,7 +187,7 @@ function _drush_build_rsync_options($additional_options, $include_settings_is_de
       }
     }
     if ((isset($test_option)) && !in_array($test_option, $options_to_exclude) && (isset($value)  && !is_array($value))) {
-      if ($value === TRUE) {
+      if (($value === TRUE) || (!isset($value))) {
         $options .= " --$test_option";
       }
       else {
diff --git a/includes/command.inc b/includes/command.inc
index 5838771..c6d6dc3 100644
--- a/includes/command.inc
+++ b/includes/command.inc
@@ -1601,7 +1601,12 @@ function drush_get_original_cli_args_and_options($command = NULL) {
   $command_options = ($command == NULL) ? array() : _drush_get_command_options($command);
   foreach ($command_specific_options as $key => $value) {
     if (!array_key_exists($key, $command_options)) {
-      $args[] = "--$key=$value";
+      if (($value === TRUE) || (!isset($value))) {
+        $args[] = "--$key";
+      }
+      else {
+        $args[] = "--$key=$value";
+      }
     }
   }
   return $args;