diff --git a/git-p4 b/git-p4
index 7525d2d..48612af 100755
--- a/git-p4
+++ b/git-p4
@@ -10,6 +10,7 @@
 
 import optparse, sys, os, marshal, subprocess, shlex
 import tempfile, os.path, time, platform
+import urllib
 import re
 import cStringIO
 import StringIO
@@ -1306,6 +1307,9 @@ class P4Sync(Command):
             if path.startswith(p):
                 path = path[len(p):]
 
+        # paths come in percent-encoded for @,%,#,* (url-style)
+        path = urllib.unquote(path)
+
         return path
 
     def splitFilesIntoBranches(self, commit):