diff --git a/go1.19.changes b/go1.19.changes
index ecaf6ca..41cc69e 100644
--- a/go1.19.changes
+++ b/go1.19.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 19 17:53:40 UTC 2022 - Dirk Müller <dmueller@suse.com>
+
+- bootstrap factory via go1.16, so that older versions can be removed
+  from factory 
+
 -------------------------------------------------------------------
 Tue Aug  9 05:56:23 UTC 2022 - Jeff Kowalczyk <jkowalczyk@suse.com>
 
diff --git a/go1.19.spec b/go1.19.spec
index cc0f73c..1ff0fba 100644
--- a/go1.19.spec
+++ b/go1.19.spec
@@ -28,11 +28,7 @@
 %define gcc_go_version 8
 %define go_bootstrap_version go1.4
 %else
-%ifarch riscv64
-%define go_bootstrap_version go1.14
-%else
-%define go_bootstrap_version go1.9
-%endif
+%define go_bootstrap_version go1.16
 %if 0%{?sle_version} == 150000
 # SLE15 or Leap 15.x
 %define gcc_go_version 7
@@ -41,15 +37,9 @@
 %endif
 %endif
 
-# By default use go and not gccgo
+# By default use go, use '--with gccgo' to bootstrap via gccgo
 %bcond_with    gccgo
 
-# The fallback boostrap method via %%{go_bootstrap_version} would work for Leap
-# but we don't have %%{go_bootstrap_version} in there. Same for SLE15+
-#if ( 0%{?suse_version} < 1550 && 0%{?is_opensuse} ) || ( 0%{?suse_version} >= 1500 && ! 0%{?is_opensuse} )
-#bcond_without gccgo
-#endif
-
 # The fallback bootstrap method via go1.4 doesn't work
 # for aarch64 nor ppc64le because go 1.4 did not support that architecture.
 %if 0%{?suse_version} == 1315
@@ -422,7 +412,6 @@ fi
 %endif
 
 %files doc
-%defattr(-,root,root,-)
 %doc %{_docdir}/go/%{go_label}/*.html
 
 %ifarch %{tsan_arch}