diff --git a/hgext/convert/p4.py b/hgext/convert/p4.py
index a3b4df1734..bb1c969329 100644
--- a/hgext/convert/p4.py
+++ b/hgext/convert/p4.py
@@ -23,6 +23,20 @@ def loaditer(f):
     except EOFError:
         pass
 
+def decodefilename(filename):
+    """Perforce escapes special characters @, #, *, or %
+    with %40, %23, %2A, or %25 respectively
+
+    >>> decodefilename('portable-net45%252Bnetcore45%252Bwp8%252BMonoAndroid')
+    'portable-net45%2Bnetcore45%2Bwp8%2BMonoAndroid'
+    >>> decodefilename('//Depot/Directory/%2525/%2523/%23%40.%2A')
+    '//Depot/Directory/%25/%23/#@.*'
+    """
+    replacements = [('%2A', '*'), ('%23', '#'), ('%40', '@'), ('%25', '%')]
+    for k, v in replacements:
+        filename = filename.replace(k, v)
+    return filename
+
 class p4_source(converter_source):
     def __init__(self, ui, path, revs=None):
         super(p4_source, self).__init__(ui, path, revs=revs)
@@ -138,7 +152,7 @@ class p4_source(converter_source):
                 filename = None
                 for v in vieworder:
                     if oldname.lower().startswith(v.lower()):
-                        filename = views[v] + oldname[len(v):]
+                        filename = decodefilename(views[v] + oldname[len(v):])
                         break
                 if filename:
                     files.append((filename, d["rev%d" % i]))
diff --git a/tests/test-doctest.py b/tests/test-doctest.py
index 8b02a4a9a9..98042b4c47 100644
--- a/tests/test-doctest.py
+++ b/tests/test-doctest.py
@@ -33,5 +33,6 @@ testmod('mercurial.util')
 testmod('mercurial.util', testtarget='platform')
 testmod('hgext.convert.cvsps')
 testmod('hgext.convert.filemap')
+testmod('hgext.convert.p4')
 testmod('hgext.convert.subversion')
 testmod('hgext.mq')