diff --git a/.gitignore b/.gitignore
index d33c2ca..9c7be30 100644
--- a/.gitignore
+++ b/.gitignore
@@ -104,3 +104,4 @@
 /go1.16.5.src.tar.gz
 /go1.16.6.src.tar.gz
 /go1.17rc2.src.tar.gz
+/go1.16.8.src.tar.gz
diff --git a/golang.spec b/golang.spec
index 8101fb8..c94655d 100644
--- a/golang.spec
+++ b/golang.spec
@@ -105,9 +105,8 @@
 %global gohostarch  s390x
 %endif
 
-%global go_api 1.17
-%global go_prerelease rc2
-%global go_version %{go_api}%{?go_prerelease}
+%global go_api 1.16
+%global go_version %{go_api}.8
 
 # For rpmdev-bumpspec and releng automation
 %global baserelease 1
@@ -336,7 +335,6 @@ GOROOT=$(pwd) PATH=$(pwd)/bin:$PATH go install -race -v -x std
 %endif
 
 %install
-echo "== 1 =="
 rm -rf $RPM_BUILD_ROOT
 # remove GC build cache
 rm -rf pkg/obj/go-build/*
@@ -347,9 +345,9 @@ mkdir -p $RPM_BUILD_ROOT%{goroot}
 
 # install everything into libdir (until symlink problems are fixed)
 # https://code.google.com/p/go/issues/detail?id=5830
-cp -apv api bin doc lib pkg src misc test VERSION \
+cp -apv api bin doc favicon.ico lib pkg robots.txt src misc test VERSION \
    $RPM_BUILD_ROOT%{goroot}
-echo "== 2 =="
+
 # bz1099206
 find $RPM_BUILD_ROOT%{goroot}/src -exec touch -r $RPM_BUILD_ROOT%{goroot}/VERSION "{}" \;
 # and level out all the built archives
@@ -367,7 +365,6 @@ tests_list=$cwd/go-tests.list
 rm -f $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list
 touch $src_list $pkg_list $docs_list $misc_list $tests_list $shared_list $race_list
 pushd $RPM_BUILD_ROOT%{goroot}
-  echo "== 3 =="
     find src/ -type d -a \( ! -name testdata -a ! -ipath '*/testdata/*' \) -printf '%%%dir %{goroot}/%p\n' >> $src_list
     find src/ ! -type d -a \( ! -ipath '*/testdata/*' -a ! -name '*_test.go' \) -printf '%{goroot}/%p\n' >> $src_list
 
@@ -381,7 +378,6 @@ pushd $RPM_BUILD_ROOT%{goroot}
     find misc/ ! -type d -printf '%{goroot}/%p\n' >> $misc_list
 
 %if %{shared}
-echo "== 4 =="
     mkdir -p %{buildroot}/%{_libdir}/
     mkdir -p %{buildroot}/%{golibdir}/
     for file in $(find .  -iname "*.so" ); do
@@ -398,8 +394,6 @@ echo "== 4 =="
     find pkg/*_dynlink/ ! -type d -printf '%{goroot}/%p\n' >> $shared_list
 %endif
 
-echo "== 5 =="
-
 %if %{race}
 
     find pkg/*_race/ -type d -printf '%%%dir %{goroot}/%p\n' >> $race_list
@@ -415,7 +409,7 @@ echo "== 5 =="
     find lib/ -type d -printf '%%%dir %{goroot}/%p\n' >> $tests_list
     find lib/ ! -type d -printf '%{goroot}/%p\n' >> $tests_list
 popd
-echo "== 6 =="
+
 # remove the doc Makefile
 rm -rfv $RPM_BUILD_ROOT%{goroot}/doc/Makefile
 
@@ -430,7 +424,7 @@ mkdir -p $RPM_BUILD_ROOT%{gopath}/src/github.com
 mkdir -p $RPM_BUILD_ROOT%{gopath}/src/bitbucket.org
 mkdir -p $RPM_BUILD_ROOT%{gopath}/src/code.google.com/p
 mkdir -p $RPM_BUILD_ROOT%{gopath}/src/golang.org/x
-echo "== 7 =="
+
 # make sure these files exist and point to alternatives
 rm -f $RPM_BUILD_ROOT%{_bindir}/go
 ln -sf /etc/alternatives/go $RPM_BUILD_ROOT%{_bindir}/go
@@ -441,8 +435,6 @@ ln -sf /etc/alternatives/gofmt $RPM_BUILD_ROOT%{_bindir}/gofmt
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d
 cp -av %{SOURCE100} $RPM_BUILD_ROOT%{_sysconfdir}/gdbinit.d/golang.gdb
 
-echo "== END OF INSTALL =="
-
 %check
 export GOROOT=$(pwd -P)
 export PATH="$GOROOT"/bin:"$PATH"
@@ -497,6 +489,8 @@ fi
 %dir %{goroot}
 %{goroot}/api/
 %{goroot}/lib/time/
+%{goroot}/favicon.ico
+%{goroot}/robots.txt
 
 # ensure directory ownership, so they are cleaned up if empty
 %dir %{gopath}
@@ -535,17 +529,15 @@ fi
 %endif
 
 %changelog
-* Mon Aug 09 2021 Alejandro Sáez <asm@redhat.com> - 1.17-0.rc2
-- Update to go1.17rc2
-- Update patches
-- Remove patch, already in the source https://go-review.googlesource.com/c/go/+/334410/
+* Fri Sep 10 2021 Alejandro Sáez <asm@redhat.com> - 1.16.8-1
+- Update to go1.16.8
+- Remove patch: ppc64le-vdso-fix.patch
+- Related: rhbz#1937911
+- Related: rhbz#1999415
 
-* Thu Jul 29 2021 Jakub Čajka <jcajka@redhat.com> - 1.16.6-3
+* Thu Jul 29 2021 Jakub Čajka <jcajka@redhat.com> - 1.16.6-2
 - fix crash in VDSO calls on ppc64le with new kernels
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.6-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
 * Wed Jul 14 2021 Mike Rochefort <mroche@fedoraproject.org> - 1.16.6-1
 - Update to go1.16.6
 - Security fix for CVE-2021-34558
@@ -568,6 +560,7 @@ fi
 
 * Fri Apr 09 2021 Alejandro Sáez <asm@redhat.com> - 1.16.3-1
 - Update to go1.16.3
+- Resolves: rhbz#1945768
 
 * Tue Mar 23 2021 Alejandro Sáez <asm@redhat.com> - 1.16-2
 - Update to go1.16.2
diff --git a/sources b/sources
index bdb678c..2bff3b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (go1.17rc2.src.tar.gz) = d1f9e687011acee30232c30e75c66cb920f314db02bf1f0c90e360095f0fb089d2adb346acaac1a22b7e114efa6d880b721e461edc67ccb79bedf15eff619de8
+SHA512 (go1.16.8.src.tar.gz) = 49b3b341ee3dbf2964f8e938a6d797a48e4b46e19c6c6f240038cd48c8668b76982f0c9c61e38bfdc42eb03db72d125457905cba76589d1d7d2f825bc67587e3