Index: subversion/libsvn_wc/adm_ops.c
===================================================================
--- subversion/libsvn_wc/adm_ops.c	(revision 17233)
+++ subversion/libsvn_wc/adm_ops.c	(working copy)
@@ -938,15 +938,14 @@
       if (was_schedule == svn_wc_schedule_add)
         {
           /* remove the properties file */
-          const char *svn_thang;
-
-          /* Working prop file. */
-          SVN_ERR (svn_wc__prop_path (&svn_thang, base_name, was_kind, FALSE,
-                                      pool));
+          const char *svn_prop_file_path;
+          SVN_ERR (svn_wc__prop_path (&svn_prop_file_path, path, adm_access,
+                                      FALSE, pool));
           SVN_ERR (svn_wc__loggy_remove (&log_accum, adm_access,
-                                         svn_thang, pool));
+                                         svn_prop_file_path, pool));
         }
 
+
       SVN_ERR (svn_wc__write_log (adm_access, 0, log_accum, pool));
 
       SVN_ERR (svn_wc__run_log (adm_access, NULL, pool));
Index: subversion/tests/clients/cmdline/prop_tests.py
===================================================================
--- subversion/tests/clients/cmdline/prop_tests.py	(revision 17234)
+++ subversion/tests/clients/cmdline/prop_tests.py	(working copy)
@@ -1112,21 +1112,38 @@
 
   wc_dir = sbox.wc_dir
   newfile_path = os.path.join(wc_dir, 'newfile')
-  
+  file_add_output = ("A         svn-test-work/working_copies/"
+                     "prop_tests-16/newfile")
+  propset_output = ("property 'newprop' set on 'svn-test-work/"
+                    "working_copies/prop_tests-16/newfile")
+  file_rm_output = ("D         svn-test-work/working_copies/"
+                    "prop_tests-16/newfile")
+  propls_output = [ 
+     "Properties on 'svn-test-work/working_copies/prop_tests-16/newfile':\n",
+     "  newprop : newvalue\n",
+                  ]
+   
   # create new fs file
-  svntest.main.file_append(newfile_path, "")
-  svntest.main.run_svn(None, 'add', newfile_path)
-  svntest.main.run_svn(None, 'propset', 'newprop', 'newvalue', newfile_path)
-  svntest.main.run_svn(None, 'rm', '--force', newfile_path)
+  open(newfile_path, 'w').close()
+  # Add it and set a property
+  svntest.actions.run_and_verify_svn(None, file_add_output, [], 'add', newfile_path)
+  svntest.actions.run_and_verify_svn(None, propset_output, [], 'propset',
+                                     'newprop', 'newvalue', newfile_path)
+  svntest.actions.run_and_verify_svn(None, propls_output, [],
+                                     'proplist', '-v', newfile_path)
+  # remove the file
+  svntest.actions.run_and_verify_svn(None, file_rm_output, [],
+                                     'rm', '--force', newfile_path)
   # recreate the file and add it again
-  svntest.main.file_append(newfile_path, "")
-  svntest.main.run_svn(None, 'add', newfile_path)
+  open(newfile_path, 'w').close()
+  svntest.actions.run_and_verify_svn(None, file_add_output, [], 'add', newfile_path)
 
-  # check the properties
+  # Now there should be NO properties leftover...
   svntest.actions.run_and_verify_svn(None, [], [],
                                      'proplist', '-v', newfile_path)
 
 
+
 ########################################################################
 # Run the tests