Index: libsvn_wc/props.c
===================================================================
--- libsvn_wc/props.c	(revision 16820)
+++ libsvn_wc/props.c	(working copy)
@@ -168,7 +168,7 @@
 
   SVN_ERR (err);
 
-  SVN_ERR_W (svn_hash_read (hash, propfile, pool),
+  SVN_ERR_W (svn_hash_read2 (hash, svn_stream_from_aprfile (propfile, pool), NULL, pool),
              apr_psprintf (pool, _("Can't parse '%s'"),
                            svn_path_local_style (propfile_path, pool)));
 
@@ -193,7 +193,7 @@
                               | APR_BUFFERED), 
                              APR_OS_DEFAULT, pool));
 
-  SVN_ERR_W (svn_hash_write (hash, prop_tmp, pool),
+  SVN_ERR_W (svn_hash_write2 (hash, svn_stream_from_aprfile (prop_tmp, pool), NULL, pool),
              apr_psprintf (pool, 
                            _("Can't write property hash to '%s'"),
                            svn_path_local_style (propfile_path, pool)));
@@ -1289,7 +1289,7 @@
                                1, /* we DO want wcprops */
                                pool));
   /* Write. */
-  SVN_ERR_W (svn_hash_write (prophash, fp, pool),
+  SVN_ERR_W (svn_hash_write2 (prophash, svn_stream_from_aprfile (fp, pool), NULL, pool),
              apr_psprintf (pool,
                            _("Cannot write property hash for '%s'"),
                            svn_path_local_style (path, pool)));
@@ -1625,7 +1625,7 @@
                                0, /* not wcprops */
                                pool));
   /* Write. */
-  SVN_ERR_W (svn_hash_write (prophash, fp, pool),
+  SVN_ERR_W (svn_hash_write2 (prophash, svn_stream_from_aprfile (fp, pool), NULL, pool),
              apr_psprintf (pool, 
                            _("Cannot write property hash for '%s'"),
                            svn_path_local_style (path, pool)));