diff --git a/go.changes b/go.changes
index 78bf947..c8c18e1 100644
--- a/go.changes
+++ b/go.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 23 15:25:15 UTC 2016 - jmassaguerpla@suse.com
+
+- Reverting to use gcc-go instead of go1.4 for Factory and Leap
+  The fallback boostrap method via go1.4 does not work for Factory because
+  of a known bug with binutils 2.27 https://github.com/golang/go/issues/16906.
+  Leap will work but we don't have go1.4 in there.
+
 -------------------------------------------------------------------
 Wed Sep 21 15:35:51 UTC 2016 - jmassaguerpla@suse.com
 
diff --git a/go.spec b/go.spec
index 5732bf2..ab3d5d3 100644
--- a/go.spec
+++ b/go.spec
@@ -16,6 +16,19 @@
 #
 
 
+# The fallback boostrap method via go1.4 does not work for Factory because
+# of a known bug with binutils 2.27 https://github.com/golang/go/issues/16906.
+# Leap will work but we don't have go1.4 in there.
+%if 0%{?suse_version} > 1320
+# openSUSE Factory
+%define with_gccgo 1
+%else
+%if 0%{?suse_version} == 1315 && 0%{?is_opensuse}
+# openSUSE Leap
+%define with_gccgo 1
+%endif
+%endif
+
 # The fallback bootstrap method via go1.4 doesn't work
 # for aarch64 nor ppc64le because go 1.4 did not support that architecture.
 %ifarch aarch64 ppc64le ppc64