diff --git a/runc.changes b/runc.changes
index eacd8aa..88f70a0 100644
--- a/runc.changes
+++ b/runc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 24 12:27:57 UTC 2016 - jmassaguerpla@suse.com
+
+- add go_arches in project configuration: this way, we can use the
+  same spec file but decide in the project configuration if to
+  use gc-go or gcc-go for some archs. 
+
 -------------------------------------------------------------------
 Thu Aug 18 10:35:29 UTC 2016 - jmassaguerpla@suse.com
 
diff --git a/runc.spec b/runc.spec
index 80b83e2..b0fd9c8 100644
--- a/runc.spec
+++ b/runc.spec
@@ -16,7 +16,23 @@
 #
 
 
-%define go_arches %ix86 x86_64 aarch64 ppc64le
+# Check if go_arches is defined in the project configuration
+# Otherwise, define it here
+# In order to define it in the project configuration, you need to add
+#
+# %define go_arches %ix86 x86_64 aarch64
+# Macros:
+# %go_arches %ix86 x86_64 aarch64
+# :Macros
+#
+# The Macros is the one that defines the go_arches variable to be used
+# in the spec file.
+# The "define" one is to help the specfile parser of the buildservice
+# to see what packages are being built. You also want to define it here
+# for keeping things consistent.
+
+%{!?go_arches: %define go_arches %ix86 x86_64 aarch64 ppc64le}
+
 %ifarch %go_arches
 %define go_tool go
 %else