diff --git a/PVE/API2/Storage/Status.pm b/PVE/API2/Storage/Status.pm
index 8f97c18..e04e184 100644
--- a/PVE/API2/Storage/Status.pm
+++ b/PVE/API2/Storage/Status.pm
@@ -341,7 +341,7 @@ __PACKAGE__->register_method ({
 
 	chomp $filename;
 	$filename =~ s/^.*[\/\\]//;
-	$filename =~ s/\s/_/g;
+	$filename =~ s/[;:,=\s\x80-\xff]/_/g;
 
 	my $path;
 
@@ -373,7 +373,7 @@ __PACKAGE__->register_method ({
 
 	    my @ssh_options = ('-o', 'BatchMode=yes');
 
-	    my @remcmd = ('/usr/bin/ssh', @ssh_options, $remip);
+	    my @remcmd = ('/usr/bin/ssh', @ssh_options, $remip, '--');
 
 	    eval { 
 		# activate remote storage
@@ -382,14 +382,14 @@ __PACKAGE__->register_method ({
 	    };
 	    die "can't activate storage '$param->{storage}' on node '$node'\n" if $@;
 
- 	    PVE::Tools::run_command([@remcmd, '/bin/mkdir', '-p', $dirname],
+	    PVE::Tools::run_command([@remcmd, '/bin/mkdir', '-p', '--', PVE::Tools::shell_quote($dirname)],
 				    errmsg => "mkdir failed");
  
-	    $cmd = ['/usr/bin/scp', @ssh_options, $tmpfilename, "$remip:$dest"];
+	    $cmd = ['/usr/bin/scp', @ssh_options, '--', $tmpfilename, "[$remip]:" . PVE::Tools::shell_quote($dest)];
 	} else {
 	    PVE::Storage::activate_storage($cfg, $param->{storage});
 	    File::Path::make_path($dirname);
-	    $cmd = ['cp', $tmpfilename, $dest];
+	    $cmd = ['cp', '--', $tmpfilename, $dest];
 	}
 
 	my $worker = sub  {