diff --git a/.gitignore b/.gitignore
index 74b43e5..d22e3e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -137,3 +137,5 @@
 /subscription-manager-cockpit-1.29.12.tar.gz
 /subscription-manager-1.29.14.tar.gz
 /subscription-manager-cockpit-1.29.14.tar.gz
+/subscription-manager-1.29.15.tar.gz
+/subscription-manager-cockpit-1.29.15.tar.gz
diff --git a/sources b/sources
index 65629c1..6008f07 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (subscription-manager-1.29.14.tar.gz) = b991bbe800ee6e5859e5f5ccf8ea8d50984dbd0fa6b616e3aca9f5b83b5142d58055cb37e3ba223dcdf5b8e50ba4703f7a5a52afa89edd13b940b53db60bb8db
-SHA512 (subscription-manager-cockpit-1.29.14.tar.gz) = 893a89b4fc6934d63c5bcc7893c8daaa860a06f3c6a004e4e5e15b1c668af8dee205dd69d68b6968b132056374cf607b8f31c7b7a5d9b3af444ae3da2872bee0
+SHA512 (subscription-manager-1.29.15.tar.gz) = cfa2c5ec04392767336df9a2aefb683f5da15a95a0d7d2886235ad79d9053b291f7736ff12779abbb22fae49accb426743bcc4d3b075837524f20aa56595f7d3
+SHA512 (subscription-manager-cockpit-1.29.15.tar.gz) = ab153982d7d7023a7c993378aef91a1f8ce7c8206e2b75e8004688d31fb6c3f751bb3a06ada5f4f5c5780c4b290c8b12543dde5e14ea1d836ec5877fe783b679
diff --git a/subscription-manager.spec b/subscription-manager.spec
index 96c6bb2..3ba600e 100644
--- a/subscription-manager.spec
+++ b/subscription-manager.spec
@@ -93,9 +93,10 @@
 %global use_inotify 0
 %endif
 
-# Do not ship initial-setup in RHEL 9 and on, as Anaconda can now register
-# during the installation.
-%if (0%{?rhel} && 0%{?rhel} < 9)
+# Do not ship initial-setup in RHEL 9+ and Fedora:
+# - as Anaconda can now register during the installation
+# - it uses old Anaconda APIs that are not supported anymore
+%if 0%{?rhel} >= 9 || 0%{?fedora}
 %global use_initial_setup 0
 %endif
 
@@ -246,7 +247,7 @@
 %global use_rhsm_icons 0%{use_cockpit} || 0%{use_rhsm_gtk}
 
 Name: subscription-manager
-Version: 1.29.14
+Version: 1.29.15
 Release: 1%{?dist}
 Summary: Tools and libraries for subscription and repository management
 %if 0%{?suse_version}
@@ -645,7 +646,7 @@ Requires: rhsm-gtk = %{version}-%{release}
 Requires: initial-setup-gui >= 0.3.9.24-1
 Obsoletes: subscription-manager-firstboot < 1.15.3-1
 %if (0%{?rhel} >= 8)
-#Supplements: initial-setup-gui
+Supplements: initial-setup-gui
 %endif
 
 %description -n subscription-manager-initial-setup-addon
@@ -1532,6 +1533,10 @@ gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || :
 %endif
 
 %changelog
+* Fri Jun 18 2021 Christopher Snyder <csnyder@redhat.com> 1.29.15-1
+- 1941904: actually disable initial-setup in RHEL >= 9, and Fedora too (#2675)
+  (ptoscano@redhat.com)
+
 * Wed Jun 16 2021 Christopher Snyder <csnyder@redhat.com> 1.29.14-1
 - Drop more files/references of old standalone syspurpose tool
   (ptoscano@redhat.com)