diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 9f99cfc11a..22b26ac519 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1357,7 +1357,10 @@ class Core_Upgrader extends WP_Upgrader {
 			return false;
 
 		foreach ( $checksums[ $wp_version ] as $file => $checksum ) {
-			if ( md5_file( ABSPATH . $file ) !== $checksum )
+			// Skip files which get updated
+			if ( 'wp-content' == substr( $file, 0, 10 ) )
+				continue;
+			if ( ! file_exists( ABSPATH . $file ) || md5_file( ABSPATH . $file ) !== $checksum )
 				return false;
 		}
 
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index a4eecf4f92..1d228956c6 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -698,7 +698,9 @@ function update_core($from, $to) {
 		$checksums = get_core_checksums( $wp_version );
 		if ( ! empty( $checksums[ $wp_version ] ) && is_array( $checksums[ $wp_version ] ) ) {
 			foreach( $checksums[ $wp_version ] as $file => $checksum ) {
-				if ( md5_file( ABSPATH . $file ) === $checksum )
+				if ( 'wp-content' == substr( $file, 0, 10 ) )
+					continue;
+				if ( file_exists( ABSPATH . $file ) && md5_file( ABSPATH . $file ) === $checksum )
 					$skip[] = $file;
 			}
 		}