diff --git a/docker.changes b/docker.changes
index 8a3d67a..b4775e0 100644
--- a/docker.changes
+++ b/docker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May 18 14:21:09 UTC 2016 - asarai@suse.de
+
+* Make sure we *always* build unstripped Go binaries.
+
 -------------------------------------------------------------------
 Mon May 16 13:55:07 UTC 2016 - asarai@suse.de
 
diff --git a/docker.spec b/docker.spec
index f4e268c..43a9eb7 100644
--- a/docker.spec
+++ b/docker.spec
@@ -104,6 +104,13 @@ ExcludeArch:    s390x
 %endif
 ExcludeArch:    ppc
 
+# It's a bad idea to strip Go binaries (apart from making debugging impossible,
+# it also is known to cause some interesting runtime bugs). However, rpmbuild
+# will strip your binaries if it is creating debuginfo packages (as well as
+# doing it by default). So we have to manually disable both of these things.
+%undefine _build_create_debug
+%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
+
 %description
 Docker complements LXC with a high-level API which operates at the process
 level. It runs unix processes with strong guarantees of isolation and