diff --git a/.gitignore b/.gitignore
index 8edcdad..ed3a68e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,3 +91,5 @@
 /rpm-ostree-2020.4.tar.xz
 /rpm-ostree-2020.4.15.g8b0bcd7b.tar.xz
 /rpm-ostree-2020.5.tar.xz
+/rpm-ostree-2020.6.tar.xz
+/rpm-ostree-2020.7.tar.xz
diff --git a/gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch b/gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch
deleted file mode 100644
index 158b0dd..0000000
--- a/gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ac26db038e67ea7fe8236cfafabcba74ad89b894 Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 22 Oct 2020 14:25:51 +0000
-Subject: [PATCH] sysroot: Fix usage of sd_journal_send on 32 bit
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=1890577
-
-This is the same as https://github.com/ostreedev/ostree/pull/2219
----
- src/daemon/rpmostree-sysroot-upgrader.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c
-index 32e77a0a3..7a8e1e9ea 100644
---- a/src/daemon/rpmostree-sysroot-upgrader.c
-+++ b/src/daemon/rpmostree-sysroot-upgrader.c
-@@ -1328,9 +1328,9 @@ write_history (RpmOstreeSysrootUpgrader *self,
-                    SD_ID128_FORMAT_VAL(RPMOSTREE_NEW_DEPLOYMENT_MSG),
-                    "MESSAGE=Created new deployment /%s", deployment_dirpath,
-                    "DEPLOYMENT_PATH=/%s", deployment_dirpath,
--                   "DEPLOYMENT_TIMESTAMP=%ld", stbuf.st_ctime,
--                   "DEPLOYMENT_DEVICE=%u", stbuf.st_dev,
--                   "DEPLOYMENT_INODE=%u", stbuf.st_ino,
-+                   "DEPLOYMENT_TIMESTAMP=%" PRIu64, (uint64_t) stbuf.st_ctime,
-+                   "DEPLOYMENT_DEVICE=%" PRIu64, (uint64_t) stbuf.st_dev,
-+                   "DEPLOYMENT_INODE=%" PRIu64, (uint64_t) stbuf.st_ino,
-                    "DEPLOYMENT_CHECKSUM=%s", ostree_deployment_get_csum (new_deployment),
-                    "DEPLOYMENT_REFSPEC=%s", rpmostree_origin_get_refspec (self->origin),
-                    /* we could use iovecs here and sd_journal_sendv to make these truly
diff --git a/rpm-ostree-gcc11.patch b/rpm-ostree-gcc11.patch
new file mode 100644
index 0000000..307b951
--- /dev/null
+++ b/rpm-ostree-gcc11.patch
@@ -0,0 +1,13 @@
+diff --git a/src/daemon/rpmostree-sysroot-upgrader.c b/src/daemon/rpmostree-sysroot-upgrader.c
+index 7b160e4..af48122 100644
+--- a/src/daemon/rpmostree-sysroot-upgrader.c
++++ b/src/daemon/rpmostree-sysroot-upgrader.c
+@@ -1712,7 +1712,7 @@ rpmostree_sysroot_upgrader_deploy (RpmOstreeSysrootUpgrader *self,
+ GType
+ rpmostree_sysroot_upgrader_flags_get_type (void)
+ {
+-  static volatile gsize g_define_type_id__volatile = 0;
++  static gsize g_define_type_id__volatile = 0;
+ 
+   if (g_once_init_enter (&g_define_type_id__volatile))
+     {
diff --git a/rpm-ostree.spec b/rpm-ostree.spec
index 646321c..186bd05 100644
--- a/rpm-ostree.spec
+++ b/rpm-ostree.spec
@@ -3,15 +3,14 @@
 
 Summary: Hybrid image/package system
 Name: rpm-ostree
-Version: 2020.5
-Release: 2%{?dist}
+Version: 2020.7
+Release: 1%{?dist}
 License: LGPLv2+
-URL: https://github.com/projectatomic/rpm-ostree
-#VCS: https://github.com/cgwalters/rpm-ostree
+URL: https://github.com/coreos/rpm-ostree
 # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
 # in the upstream git.  If rust is enabled, it contains vendored sources.
-Source0: rpm-ostree-%{version}.tar.xz
-Patch0:  gh-pr2276-sysroot-fix-usage-of-sd_journal_send-on-32-bit.patch
+Source0: https://github.com/coreos/rpm-ostree/releases/download/v%{version}/rpm-ostree-%{version}.tar.xz
+Patch0: %{name}-gcc11.patch
 
 ExclusiveArch: %{rust_arches}
 
@@ -195,6 +194,16 @@ $PYTHON autofiles.py > files.devel \
 
 %files devel -f files.devel
 %changelog
+* Mon Nov 02 2020 Luca BRUNO <lucab@lucabruno.net> - 2020.7-1
+- New upstream version
+  https://github.com/coreos/rpm-ostree/releases/tag/v2020.7
+
+* Mon Nov 02 2020 Jeff Law <law@redhat.com> - 2020.6-2
+- Fix invalid use of volatile caught by gcc-11
+
+* Fri Oct 30 16:48:43 UTC 2020 Colin Walters <walters@verbum.org> - 2020.6-1
+- https://github.com/coreos/rpm-ostree/releases/tag/v2020.6
+
 * Wed Oct 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 2020.5-2
 - sysroot: Fix usage of sd_journal_send on 32 bit (gh#2276)
 
diff --git a/sources b/sources
index 6d71e5a..7074641 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (rpm-ostree-2020.5.tar.xz) = a7b2fabec124983c7eded63650adeff9a5c328b91f261c66582a2b4ba0bb9ed5b766b5ee773bbaeedaa797aba4975645f90e880de601950dc0dd53a2723c1987
+SHA512 (rpm-ostree-2020.7.tar.xz) = e8056f58d396b906642624bb55f48e618e95193a026761cccd0d33bb56524ddec5012f7b922f51504c5c2e0cb2757b758636cb8aebeace5aae3d24dc864f16f2