Index: subversion/libsvn_subr/io.c
===================================================================
--- subversion/libsvn_subr/io.c	(revision 24666)
+++ subversion/libsvn_subr/io.c	(working copy)
@@ -1793,18 +1793,19 @@
 
               SVN_ERR(svn_path_cstring_to_utf8(&entry_utf8, this_entry.name,
                                                subpool));
-          
+
               fullpath = svn_path_join(path, entry_utf8, subpool);
 
+              /* apr_dir_read doesn't grok links, so stat entry. */
+              apr_stat(&this_entry, fullpath,
+                       APR_FINFO_TYPE | APR_FINFO_LINK, subpool);
+
               if (this_entry.filetype == APR_DIR)
                 {
                   SVN_ERR(svn_io_remove_dir2(fullpath, FALSE, subpool));
                 }
-              else if (this_entry.filetype == APR_REG)
+              else
                 {
-                  /* ### Do we really need the check for APR_REG here?
-                     Shouldn't we remove symlinks, pipes and whatnot, too?
-                     --xbc */
                   svn_error_t *err = svn_io_remove_file(fullpath, subpool);
                   if (err)
                     return svn_error_createf