diff --git a/.gitignore b/.gitignore
index 715c5eb..0144cb8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/go1.12.6-1-openssl-fips.tar.gz
+SOURCES/go-go-1.13.4-1-openssl-fips.tar.gz
diff --git a/.golang.metadata b/.golang.metadata
index 386a027..c6b3f80 100644
--- a/.golang.metadata
+++ b/.golang.metadata
@@ -1 +1 @@
-09eb75f2212869f13882f7bab933ec070712da33 SOURCES/go1.12.6-1-openssl-fips.tar.gz
+c9f2a53028d012c6db32a34a9345e08aba31a771 SOURCES/go-go-1.13.4-1-openssl-fips.tar.gz
diff --git a/SOURCES/fix_TestScript_list_std.patch b/SOURCES/fix_TestScript_list_std.patch
index f1f00b7..1387cb7 100644
--- a/SOURCES/fix_TestScript_list_std.patch
+++ b/SOURCES/fix_TestScript_list_std.patch
@@ -1,25 +1,13 @@
-From 00b6dcb4eec0dd1bb931493e59ee223c08be1ae8 Mon Sep 17 00:00:00 2001
-From: Derek Parker <deparker@redhat.com>
-Date: Wed, 5 Dec 2018 13:20:23 -0800
-Subject: [PATCH] testdata/script: Ignore _$GOROOT in test
-
----
- src/cmd/go/testdata/script/list_std.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
diff --git a/src/cmd/go/testdata/script/list_std.txt b/src/cmd/go/testdata/script/list_std.txt
-index a63d74db1205a4a905e319eb59b195ce0625163e..137eb717ad4a8ec24902dcf668b7de48e1929087 100644
+index 6ab1bd1674..4a00e436fd 100644
--- a/src/cmd/go/testdata/script/list_std.txt
+++ b/src/cmd/go/testdata/script/list_std.txt
-@@ -3,7 +3,7 @@
- # listing GOROOT should only find standard packages
+@@ -6,7 +6,7 @@ env GO111MODULE=off
+ # Listing GOROOT should only find standard packages.
cd $GOROOT/src
go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' ./...
-! stdout .
+stdout _$GOROOT
- # TODO: ignore _/blah/go/src in output
- # our vendored packages should be reported as standard
---
-2.16.5
-
+ # Standard packages should include cmd, but not cmd/vendor.
+ go list ./...
diff --git a/SPECS/golang.spec b/SPECS/golang.spec
index 2b0a2fc..6ff71c6 100644
--- a/SPECS/golang.spec
+++ b/SPECS/golang.spec
@@ -1,5 +1,7 @@
%undefine _missing_build_ids_terminate_build
+%global bcond_with strict_fips
+
# build ids are not currently generated:
# https://code.google.com/p/go/issues/detail?id=5238
#
@@ -96,17 +98,18 @@
%global gohostarch s390x
%endif
-%global go_api 1.12
-%global go_version 1.12.6
+%global go_api 1.13
+%global go_version 1.13.4
+%global pkg_release 1
Name: golang
Version: %{go_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The Go Programming Language
# source tree includes several copies of Mark.Twain-Tom.Sawyer.txt under Public Domain
License: BSD and Public Domain
URL: http://golang.org/
-Source0: http://releases.pagure.org/go/go%{go_version}-1-openssl-fips.tar.gz
+Source0: https://pagure.io/go/archive/go-%{go_version}-%{pkg_release}-openssl-fips/go-go-%{go_version}-%{pkg_release}-openssl-fips.tar.gz
# make possible to override default traceback level at build time by setting build tag rpm_crashtraceback
Source1: fedora.go
@@ -226,7 +229,7 @@ Requires: %{name} = %{version}-%{release}
%endif
%prep
-%setup -q -n go%{go_version}-openssl-fips
+%setup -q -n go-go-%{go_version}-%{pkg_release}-openssl-fips
%patch215 -p1
@@ -422,6 +425,11 @@ export GO_TEST_RUN=""
%endif
%if %{fail_on_tests}
+
+# Limit number of test threads on i686 to avoid OOM failures.
+%ifarch %{ix86}
+export GOMAXPROCS=8
+%endif
./run.bash --no-rebuild -v -v -v -k $GO_TEST_RUN
# Run tests with FIPS enabled.
@@ -497,6 +505,37 @@ cd ..
%endif
%changelog
+* Wed Nov 27 2019 Alejandro Sáez <asm@redhat.com> - 1.13.4-2
+- Remove patches
+- Related: rhbz#1747150
+
+* Mon Nov 25 2019 Alejandro Sáez <asm@redhat.com> - 1.13.4-1
+- Rebase to 1.13.4
+- Related: rhbz#1747150
+
+* Tue Sep 17 2019 Tom Stellard <tstellar@redhat.com> - 1.12.8-4
+- Reduce number of threads when testing on i686
+
+* Wed Sep 11 2019 Tom Stellard <tstellar@redhat.com> - 1.12.8-3
+- Relax FIPS requirements to unblock OpenShift testing
+
+* Wed Aug 28 2019 Tom Stellard <tstellar@redhat.com> - 1.12.8-2
+- Rebase to 1.12.8
+- Resolves: rhbz#1745706
+- Resolves: rhbz#1745712
+
+* Mon Aug 5 2019 Derek Parker <deparker@redhat.com> - 1.12.6-3
+- Add README for more documentation
+- Resolves: rhbz#1734788
+
+* Fri Aug 2 2019 Derek Parker <deparker@redhat.com> - 1.12.6-3
+- Revert some TLS FIPS changes for now
+- Resolves: rhbz#1734788
+
+* Thu Aug 1 2019 Derek Parker <deparker@redhat.com> - 1.12.6-2
+- Updates to be less strict on key size in FIPS mode
+- Resolves: rhbz#1734788
+
* Thu Jun 13 2019 Derek Parker <deparker@redhat.com> - 1.12.6-1
- Rebase to 1.12.6
- Resolves: rhbz#1677819