diff --git a/.gitignore b/.gitignore
index ed2ebe0..0552c5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,4 @@
 /jdk-updates-jdk11u-jdk-11.0.12+3-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.12+4-4curve.tar.xz
 /jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz
+/jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz
diff --git a/NEWS b/NEWS
index e146c86..26c3f66 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,21 @@ Live versions of these release notes can be found at:
   * https://bitly.com/openjdk11012
   * https://builds.shipilev.net/backports-monitor/release-notes-11.0.12.txt
 
+* Security fixes
+  - JDK-8256157: Improve bytecode assembly
+  - JDK-8256491: Better HTTP transport
+  - JDK-8258432, CVE-2021-2341: Improve file transfers
+  - JDK-8260453: Improve Font Bounding
+  - JDK-8260960: Signs of jarsigner signing
+  - JDK-8260967, CVE-2021-2369: Better jar file validation
+  - JDK-8262380: Enhance XML processing passes
+  - JDK-8262403: Enhanced data transfer
+  - JDK-8262410: Enhanced rules for zones
+  - JDK-8262477: Enhance String Conclusions
+  - JDK-8262967: Improve Zip file support
+  - JDK-8264066, CVE-2021-2388: Enhance compiler validation
+  - JDK-8264079: Improve abstractions
+  - JDK-8264460: Improve NTLM support
 * Other changes
   - JDK-6847157: java.lang.NullPointerException: HDC for component at sun.java2d.loops.Blit.Blit
   - JDK-7106851: Test should not use System.exit
diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec
index 05134a4..8935f24 100644
--- a/java-11-openjdk.spec
+++ b/java-11-openjdk.spec
@@ -342,7 +342,7 @@
 %global origin_nice     OpenJDK
 %global top_level_dir_name   %{origin}
 %global top_level_dir_name_backup %{top_level_dir_name}-backup
-%global buildver        6
+%global buildver        7
 %global rpmrelease      0
 #%%global tagsuffix      ""
 # Priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit
@@ -372,7 +372,7 @@
 # Release will be (where N is usually a number starting at 1):
 # - 0.N%%{?extraver}%%{?dist} for EA releases,
 # - N%%{?extraver}{?dist} for GA releases
-%global is_ga           0
+%global is_ga           1
 %if %{is_ga}
 %global ea_designator ""
 %global ea_designator_zip ""
@@ -2314,6 +2314,11 @@ cjc.mainProgram(args)
 %endif
 
 %changelog
+* Tue Jul 13 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.12.0.7-0
+- Update to jdk-11.0.12.0+7
+- Update release notes to 11.0.12.0+7
+- Switch to GA mode for final release.
+
 * Thu Jul 08 2021 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.12.0.6-0.0.ea
 - Update to jdk-11.0.12.0+6
 - Update release notes to 11.0.12.0+6
diff --git a/sources b/sources
index af0ae7b..5132871 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (tapsets-icedtea-6.0.0pre00-c848b93a8598.tar.xz) = 97d026212363b3c83f6a04100ad7f6fdde833d16579717f8756e2b8c2eb70e144a41a330cb9ccde9c3badd37a2d54fdf4650a950ec21d8b686d545ecb2a64d30
-SHA512 (jdk-updates-jdk11u-jdk-11.0.12+6-4curve.tar.xz) = c5dc3101d0315b9cd5407f26142c121b0889aa931772212f717ae2c6de3c5071f16cc7b98728993384e3c9d74126c06d532af911429dd7b5baebe52a8e65d015
+SHA512 (jdk-updates-jdk11u-jdk-11.0.12+7-4curve.tar.xz) = 6a4d083ed9250730f701a4de4af929017cedfdc09015b378519a4e782f9c9771fbb5686e654044b8dceee5962abbacf5af071b277b1584dc27b430f2d60fdc12