diff --git a/checkout.py b/checkout.py
index c8f240a61f..217a5a5a4b 100644
--- a/checkout.py
+++ b/checkout.py
@@ -366,9 +366,12 @@ class SvnCheckout(CheckoutBase, SvnMixIn):
             if fnmatch.fnmatch(p.filename, prop):
               for value in values.split(';'):
                 if '=' not in value:
-                  params = [value, '*']
+                  params = [value, '.']
                 else:
                   params = value.split('=', 1)
+                if params[1] == '*':
+                  # Works around crbug.com/150960 on Windows.
+                  params[1] = '.'
                 stdout += self._check_output_svn(
                     ['propset'] + params + [p.filename], credentials=False)
         for post in post_processors:
diff --git a/patch.py b/patch.py
index 54f5d175a6..9083094e83 100644
--- a/patch.py
+++ b/patch.py
@@ -405,7 +405,7 @@ class FilePatchDiff(FilePatchBase):
       mode = match.group(2)
       # Only look at owner ACL for executable.
       if bool(int(mode[4]) & 1):
-        self.svn_properties.append(('svn:executable', '*'))
+        self.svn_properties.append(('svn:executable', '.'))
       elif not self.source_filename and self.is_new:
         # It's a new file, not from a rename/copy, then there's no property to
         # delete.
diff --git a/tests/patch_test.py b/tests/patch_test.py
index 5a442d07fe..e932abb298 100755
--- a/tests/patch_test.py
+++ b/tests/patch_test.py
@@ -82,13 +82,13 @@ class PatchTest(unittest.TestCase):
     p = patch.FilePatchDiff('git_cl/git-cl', GIT.MODE_EXE, [])
     self._check_patch(
         p, 'git_cl/git-cl', GIT.MODE_EXE, is_git_diff=True, patchlevel=1,
-        svn_properties=[('svn:executable', '*')], nb_hunks=0)
+        svn_properties=[('svn:executable', '.')], nb_hunks=0)
 
   def testFilePatchDiffHeaderModeIndex(self):
     p = patch.FilePatchDiff('git_cl/git-cl', GIT.MODE_EXE_JUNK, [])
     self._check_patch(
         p, 'git_cl/git-cl', GIT.MODE_EXE_JUNK, is_git_diff=True, patchlevel=1,
-        svn_properties=[('svn:executable', '*')], nb_hunks=0)
+        svn_properties=[('svn:executable', '.')], nb_hunks=0)
 
   def testFilePatchDiffHeaderNotExecutable(self):
     p = patch.FilePatchDiff(
@@ -332,7 +332,7 @@ class PatchTest(unittest.TestCase):
         is_new=True,
         is_git_diff=True,
         patchlevel=1,
-        svn_properties=[('svn:executable', '*')],
+        svn_properties=[('svn:executable', '.')],
         nb_hunks=1)
 
   def testGitNewMode(self):