diff --git a/.gitignore b/.gitignore
index 15a72d4..3bb5e0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,7 +90,6 @@ vs-chromium-project.txt
 /gn-468c6128db7f.tar.gz
 /gn-c97a86a72105.tar.gz
 /gn-ed1abc107815.tar.gz
-/gn-ab638bd7cbb9.tar.gz
 /gn-4a8016dc3915.tar.gz
 /gn-3d0d3445f67d.tar.gz
 /gn-7a8aa3a08a13.tar.gz
@@ -98,21 +97,3 @@ vs-chromium-project.txt
 /gn-6e8e0d6d4a15.tar.gz
 /gn-90478db6b59b.tar.gz
 /gn-487f8353f154.tar.gz
-/gn-0c25d1bbde6e.tar.gz
-/gn-cad8f67e2dd0.tar.gz
-/gn-ebc8f16ca7b0.tar.gz
-/gn-afd24ed11bc5.tar.gz
-/gn-54169531ed6d.tar.gz
-/gn-635a71e20e99.tar.gz
-/gn-c15bfa41e526.tar.gz
-/gn-5d0a4153b0bc.tar.gz
-/gn-aa3ecaecac29.tar.gz
-/gn-81b24e01531e.tar.gz
-/gn-07d3c6f4dc29.tar.gz
-/gn-092f4f0d612e.tar.gz
-/gn-e7f3202128bd.tar.gz
-/gn-c5a0003bcc2a.tar.gz
-/gn-5964f4997670.tar.gz
-/gn-64d35867ca0a.tar.gz
-/gn-5550ba0f4053.tar.gz
-/gn-9673115bc14c.tar.gz
diff --git a/gn.rpmlintrc b/gn.rpmlintrc
index 7ae199b..4de8b61 100644
--- a/gn.rpmlintrc
+++ b/gn.rpmlintrc
@@ -9,7 +9,3 @@ addFilter(r"gn-doc\..*: (zero-length|version-control-internal-file) /.*/examples
 addFilter(r"gn-doc\..*: hidden-file-or-dir /.*/examples/.*/\.(gitignore|gn)")
 # This script is for looking at, not for executing:
 addFilter(r"gn-doc\..*: env-script-interpreter /.*/infra/config/main\.star .*")
-# This is as prescribed in
-# https://docs.fedoraproject.org/en-US/packaging-guidelines/Emacs/, and the
-# macro is not unexpanded in practice.
-addFilter(r"Possible unexpanded macro in: Requires:\s+emacs-filesystem")
diff --git a/gn.spec b/gn.spec
index 5eb150a..a4f38ca 100644
--- a/gn.spec
+++ b/gn.spec
@@ -24,11 +24,11 @@ Name:           gn
 #  7. Commit the changes
 #
 # See https://gn.googlesource.com/gn/+log for the latest changes.
-%global commit 9673115bc14c8630da5b7f6fe07e0b362ac49dcb
-%global access 20260111
+%global commit 487f8353f15456474437df32bb186187b0940b45
+%global access 20250502
 %global shortcommit %{sub %{commit} 1 12}
-%global position 2316
-Version:        %{position}^%{access}.%{shortcommit}
+%global position 2234
+Version:        %{position}^%{access}git%{shortcommit}
 Release:        %autorelease
 Summary:        Meta-build system that generates build files for Ninja
 
diff --git a/last_commit_position.h b/last_commit_position.h
index ef88d41..42f827f 100644
--- a/last_commit_position.h
+++ b/last_commit_position.h
@@ -3,7 +3,7 @@
 #ifndef OUT_LAST_COMMIT_POSITION_H_
 #define OUT_LAST_COMMIT_POSITION_H_
 
-#define LAST_COMMIT_POSITION_NUM 2316
-#define LAST_COMMIT_POSITION "2316 (9673115bc14c)"
+#define LAST_COMMIT_POSITION_NUM 2234
+#define LAST_COMMIT_POSITION "2234 (487f8353f154)"
 
 #endif  // OUT_LAST_COMMIT_POSITION_H_
diff --git a/sources b/sources
index c8fd12b..9fafcb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gn-9673115bc14c.tar.gz) = b05e287b5e700e1cd725ef75a0af6088abd51be0a0c072f42daa61e39f6d159355ef95130a9f4478d7c62129a17c51f341624cfc4b58fb7d29e1c77a2e2cf3af
+SHA512 (gn-487f8353f154.tar.gz) = fa7b2f2ff84f5bfccc774cd06a2c1fd8c25948b6162339d961412413508dd3a1cebe15f930461bd76b4fce16cf45ad276b1f5e0e7de6a13e4e1a0ed053eefc3e