Index: wp-includes/functions.php
===================================================================
--- wp-includes/functions.php	(revision 22594)
+++ wp-includes/functions.php	(working copy)
@@ -1544,6 +1544,10 @@
 		}
 	}

+	$dir = untrailingslashit( BLOGUPLOADDIR );
+	$url = trailingslashit( $siteurl ) . UPLOADS;
+	$url = str_replace( UPLOADS, 'files', $url );
+
 	$basedir = $dir;
 	$baseurl = $url;