diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
index ef920cb75d..48ebd5d4e6 100644
--- a/src/wp-includes/functions.php
+++ b/src/wp-includes/functions.php
@@ -1383,14 +1383,23 @@ function wp_mkdir_p( $target ) {
 	}
 
 	// Get the permission bits.
-	if ( $target_parent && '.' != $target_parent ) {
-		$stat = @stat( $target_parent );
+	$dir_perms = false;
+	if ( $stat = @stat( $target_parent ) ) {
 		$dir_perms = $stat['mode'] & 0007777;
 	} else {
 		$dir_perms = 0777;
 	}
 
 	if ( @mkdir( $target, $dir_perms, true ) ) {
+
+		// If a umask is set that modifies $dir_perms, we'll have to re-set the $dir_perms correctly with chmod()
+		if ( $dir_perms != $dir_perms & ~umask() ) {
+			$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
+			for ( $i = 1; $i <= count( $folder_parts ); $i++ ) {
+				@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
+			}
+		}
+
 		return true;
 	}