diff --git a/DEPS b/DEPS
index 54014c668d8a8..20358af02aef4 100644
--- a/DEPS
+++ b/DEPS
@@ -98,7 +98,7 @@ allowed_hosts = [
 ]
 
 deps = {
-  'src': 'https://github.com/flutter/buildroot.git' + '@' + '47043991a50e1cfda66766009885197a05bb29f1',
+  'src': 'https://github.com/flutter/buildroot.git' + '@' + 'd05290fdfb0b8d2aad3c60bf0b4a76f368616452',
 
    # Fuchsia compatibility
    #
@@ -364,6 +364,9 @@ deps = {
   'src/third_party/libjpeg-turbo':
    Var('fuchsia_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 
+  'src/third_party/libpng':
+   Var('flutter_git') + '/third_party/libpng' + '@' + 'f46faec244dbda5f1d2a5bc370cf83125d6ffab1',
+
   'src/third_party/libwebp':
    Var('chromium_git') + '/webm/libwebp.git' + '@' + '0.6.0',
 
diff --git a/ci/licenses_golden/licenses_third_party b/ci/licenses_golden/licenses_third_party
index e9daace0acc45..c4b753dfec53d 100644
--- a/ci/licenses_golden/licenses_third_party
+++ b/ci/licenses_golden/licenses_third_party
@@ -1,4 +1,4 @@
-Signature: 54de652d00d625718e51e472314c598d
+Signature: 1d37f1b1764e5561a17007b9cd135f4c
 
 UNUSED LICENSES:
 
@@ -22056,7 +22056,6 @@ POSSIBILITY OF SUCH DAMAGE.
 LIBRARY: libpng
 ORIGIN: ../../../third_party/libpng/LICENSE
 TYPE: LicenseType.libpng
-FILE: ../../../third_party/libpng/contrib/intel/intel_sse.patch
 FILE: ../../../third_party/libpng/pngprefix.h
 ----------------------------------------------------------------------------------------------------
 <THIS BLOCK INTENTIONALLY LEFT BLANK>
@@ -22069,9 +22068,9 @@ TYPE: LicenseType.libpng
 FILE: ../../../third_party/libpng/arm/arm_init.c
 FILE: ../../../third_party/libpng/arm/filter_neon.S
 FILE: ../../../third_party/libpng/arm/filter_neon_intrinsics.c
-FILE: ../../../third_party/libpng/contrib/intel/filter_sse2_intrinsics.c
-FILE: ../../../third_party/libpng/contrib/intel/intel_init.c
-FILE: ../../../third_party/libpng/contrib/intel/intel_sse.patch
+FILE: ../../../third_party/libpng/arm/palette_neon_intrinsics.c
+FILE: ../../../third_party/libpng/intel/filter_sse2_intrinsics.c
+FILE: ../../../third_party/libpng/intel/intel_init.c
 FILE: ../../../third_party/libpng/png.c
 FILE: ../../../third_party/libpng/pngconf.h
 FILE: ../../../third_party/libpng/pngdebug.h
diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
index 59f4668bc13c9..4a2cf7a9896c1 100644
--- a/ci/licenses_golden/tool_signature
+++ b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: 697bebe56b09b4db22b6b675536566df
+Signature: f2b15cda839d356d1d2a906e432770d6
 
diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart
index e760f2c65a8fb..2ee112acd4962 100644
--- a/tools/licenses/lib/main.dart
+++ b/tools/licenses/lib/main.dart
@@ -318,9 +318,8 @@ class _RepositoryLibPngLicenseFile extends _RepositorySingleLicenseFile {
 
   static void _verifyLicense(fs.TextFile io) {
     final String contents = io.readString();
-    if (!contents.contains('COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:') ||
-        !contents.contains('png') ||
-        !contents.contains('END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.'))
+    if (!contents.contains(RegExp('COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:?')) ||
+        !contents.contains('png'))
       throw 'unexpected libpng license file contents:\n----8<----\n$contents\n----<8----';
   }
 
@@ -1628,6 +1627,24 @@ class _RepositoryLibPngDirectory extends _RepositoryDirectory {
       return _RepositoryLibPngLicenseFile(this, entry);
     return super.createFile(entry);
   }
+
+  static final RegExp skipFileTypes = RegExp(r'\.(?:jpg|png|dfa|in|3|5)$');
+
+  @override
+  bool shouldRecurse(fs.IoNode entry) {
+    return entry.name != 'contrib' // not linked in
+      && entry.name != 'mips' // not linked in
+      && entry.name != 'powerpc' // not linked in
+      && entry.name != 'projects' // not linked in
+      && entry.name != 'scripts' // not linked in
+      && entry.name != 'tests' // not linked in
+      && entry.name != 'ANNOUNCE'
+      && entry.name != 'CHANGES'
+      && entry.name != 'TODO'
+      && entry.name != 'TRADEMARK'
+      && !entry.name.contains(skipFileTypes)
+      && super.shouldRecurse(entry);
+  }
 }
 
 class _RepositoryLibWebpDirectory extends _RepositoryDirectory {
diff --git a/tools/licenses/lib/patterns.dart b/tools/licenses/lib/patterns.dart
index b09bbd9af35cf..644963a400032 100644
--- a/tools/licenses/lib/patterns.dart
+++ b/tools/licenses/lib/patterns.dart
@@ -91,6 +91,7 @@ final List<RegExp> copyrightStatementPatterns = <RegExp>[
   RegExp(r'^Based on .+, written by .+, [0-9]+\.$', caseSensitive: false),
   RegExp(r'^(?:Based on the )?x86 SIMD extension for IJG JPEG library(?: - version [0-9.]+|,)?$'),
   RegExp(r'^This software originally derived from .+\.$'),
+  RegExp(r'^Derived from [a-z._/]+$'),
   RegExp(r'^Derived from .+, which was$'),
   RegExp(r'^ *This is part of .+, a .+ library\.$'),
   RegExp(r'^This file is part of [^ ]+\.$'),