diff --git a/changelog b/changelog
new file mode 100644
index 0000000..8ababe5
--- /dev/null
+++ b/changelog
@@ -0,0 +1,24 @@
+* Mon Mar 29 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1894-4.20210329gitb2e3d862
+- Update to version 1894
+
+* Wed Mar 17 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1893-3.20210314git64b3b940
+- Stop installing xemacs plugins
+  (https://fedoraproject.org/wiki/Changes/Deprecate_xemacs)
+
+* Wed Mar 17 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1893-2.20210314git64b3b940
+- Improved source URL based on package review feedback
+
+* Mon Mar  1 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1893-1.20210314git64b3b940
+- Update to version 1893
+
+* Mon Mar  1 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1891-1.20210127gitdfcbc6fe
+- Update to version 1891
+
+* Sun Jan  3 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1884-1.20210127git94bda7cc
+- Update to version 1884
+
+* Sun Jan  3 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1876-1.20210103git0d67e272
+- Update to version 1876
+
+* Sat Dec 19 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 1875-1.20201219git4e260f1d
+- Initial spec file
diff --git a/gn-0153d369-no-O3.patch b/gn-0153d369-no-O3.patch
new file mode 100644
index 0000000..13a4820
--- /dev/null
+++ b/gn-0153d369-no-O3.patch
@@ -0,0 +1,14 @@
+diff -Naur gn-0153d369bbccc908f4da4993b1ba82728055926a-original/build/gen.py gn-0153d369bbccc908f4da4993b1ba82728055926a/build/gen.py
+--- gn-0153d369bbccc908f4da4993b1ba82728055926a-original/build/gen.py	2021-09-27 14:58:14.000000000 -0400
++++ gn-0153d369bbccc908f4da4993b1ba82728055926a/build/gen.py	2021-09-27 15:59:42.330405195 -0400
+@@ -344,10 +344,8 @@
+       cflags.extend(['-O0', '-g'])
+     else:
+       cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+       if options.no_strip:
+         cflags.append('-g')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
diff --git a/gn.spec b/gn.spec
index 49858f4..41999d9 100644
--- a/gn.spec
+++ b/gn.spec
@@ -25,7 +25,7 @@ Name:           gn
 %global access 20210329
 %global shortcommit %(echo %{commit} | cut -b -8)
 Version:        1894
-Release:        4.%{access}git%{shortcommit}%{?dist}
+Release:        %autorelease -s %{access}git%{shortcommit} -b 4
 Summary:        Meta-build system that generates build files for Ninja
 
 # BSD except for src/base/third_party/icu/, which is (Unicode and MIT); note
@@ -45,6 +45,8 @@ Source2:        update-version
 
 # Clean up compiler warnings on gcc/g++:
 Patch0:         https://src.fedoraproject.org/rpms/chromium/raw/ce30313f5e4af121140c037bf026453355534f24/f/chromium-84.0.4147.105-gn-gcc-cleanup.patch
+# Stop overriding optimization flags
+Patch1:         %{name}-0153d369-no-O3.patch
 
 # The python3_pkgversion macro is required for EPEL; see
 # https://fedoraproject.org/wiki/PackagingDrafts:Python3EPEL. On Fedora (and
@@ -84,7 +86,9 @@ The %{name}-doc package contains detailed documentation for GN.
 
 
 %prep
-%autosetup -c -n %{name}-%{commit} -p3
+%setup -c -n %{name}-%{commit} -q
+%patch0 -p3
+%patch1 -p1
 
 # Use pre-generated last_commit_position.h.
 mkdir -p ./out
@@ -96,8 +100,6 @@ cp -vp misc/vim/README.md README-vim.md
 
 # Fix shebangs in examples and such.
 %py3_shebang_fix .
-# On EPEL7, we would have to work around the missing py3_shebang_fix macro, but
-# the package would not build anyway because it requires C++17 support.
 
 
 %build
@@ -192,27 +194,4 @@ grep -E '^#define[[:blank:]]+LAST_COMMIT_POSITION[[:blank:]]+'\
 
 
 %changelog
-* Mon Mar 29 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1894-4.20210329gitb2e3d862
-- Update to version 1894
-
-* Wed Mar 17 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1893-3.20210314git64b3b940
-- Stop installing xemacs plugins
-  (https://fedoraproject.org/wiki/Changes/Deprecate_xemacs)
-
-* Wed Mar 17 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1893-2.20210314git64b3b940
-- Improved source URL based on package review feedback
-
-* Mon Mar  1 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1893-1.20210314git64b3b940
-- Update to version 1893
-
-* Mon Mar  1 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1891-1.20210127gitdfcbc6fe
-- Update to version 1891
-
-* Sun Jan  3 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1884-1.20210127git94bda7cc
-- Update to version 1884
-
-* Sun Jan  3 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 1876-1.20210103git0d67e272
-- Update to version 1876
-
-* Sat Dec 19 2020 Benjamin A. Beasley <code@musicinmybrain.net> - 1875-1.20201219git4e260f1d
-- Initial spec file
+%autochangelog
diff --git a/update-version b/update-version
index fa30370..63e96ab 100755
--- a/update-version
+++ b/update-version
@@ -95,7 +95,7 @@ fedpkg new-sources "$(
     grep -E '^Source0:' |
     sed -r 's|.*/||'
 )"
-rpmdev-bumpspec -c 'Update to version 1894' gn.spec
+fedpkg commit -m "Update to version ${POSITION}"
 git add 'last_commit_position.h' gn.spec
 
 #  vim: tw=78 ts=2 sw=2 sts=2 et ai nojs