diff --git a/.gitignore b/.gitignore
index 399e0b8..cc8f150 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,64 +1,4 @@
-/docker-5ebfacd.tar.gz
-/docker-selinux-4421e0d.tar.gz
-/docker-bbc21e4.tar.gz
-/docker-937f8fc.tar.gz
-/docker-c9c16a3.tar.gz
-/docker-ece2f2d.tar.gz
-/docker-f7125f9.tar.gz
-/docker-1dcc59a.tar.gz
-/docker-50ef691.tar.gz
-/docker-56481a3.tar.gz
-/docker-6d76e4c.tar.gz
-/docker-0d35ceb.tar.gz
-/docker-49d9a3f.tar.gz
-/docker-a53a6e6.tar.gz
-/docker-9910a0c.tar.gz
-/docker-dcff4e1.tar.gz
-/docker-selinux-99c4c77.tar.gz
-/docker-storage-setup-2cdf16f.tar.gz
-/docker-96ebfd2.tar.gz
-/docker-selinux-bebf349.tar.gz
-/docker-storage-setup-90f4a5f.tar.gz
-/docker-1cad29d.tar.gz
-/docker-a2f1a81.tar.gz
-/docker-0d8fd7c.tar.gz
-/docker-6d5bfe5.tar.gz
-/docker-5062080.tar.gz
-/docker-2df828d.tar.gz
-/docker-selinux-16ebd81.tar.gz
-/docker-storage-setup-b152398.tar.gz
-/docker-c7eed6c.tar.gz
-/docker-ba026e3.tar.gz
-/docker-59a228f.tar.gz
-/dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz
-/docker-b4e2cc5.tar.gz
-/docker-storage-setup-ac1b30e.tar.gz
-/docker-f8950e0.tar.gz
-/docker-566d2be.tar.gz
-/docker-selinux-6267b83.tar.gz
-/docker-storage-setup-d3b9ba7.tar.gz
-/docker-11b81f9.tar.gz
-/docker-selinux-b5281b7.tar.gz
-/docker-storage-setup-6898d43.tar.gz
-/docker-05653f9.tar.gz
-/docker-9107cd3.tar.gz
-/docker-selinux-d6560f8.tar.gz
-/docker-6024859.tar.gz
-/docker-selinux-44abd21.tar.gz
-/docker-c743657.tar.gz
-/docker-selinux-291bbab.tar.gz
-/docker-storage-setup-01df512.tar.gz
-/docker-8b9d2a6.tar.gz
-/docker-selinux-e522191.tar.gz
-/docker-storage-setup-0814c26.tar.gz
-/docker-0a9a759.tar.gz
-/docker-39f99b6.tar.gz
-/docker-42850f5.tar.gz
-/docker-a7f4806.tar.gz
 /docker-selinux-d9b67f9.tar.gz
-/docker-6d8d26a.tar.gz
-/docker-utils-dab51a.tar.gz
 /docker-utils-dab51ac.tar.gz
 /docker-c3726aa.tar.gz
-/docker-storage-setup-e193b3b.tar.gz
 /docker-storage-setup-f399708.tar.gz
diff --git a/build-with-debug-info.patch b/build-with-debug-info.patch
new file mode 100644
index 0000000..b7efb3e
--- /dev/null
+++ b/build-with-debug-info.patch
@@ -0,0 +1,25 @@
+From cbe045cb6a8126c5be9062caf039ada20adc5480 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Thu, 7 Jan 2016 13:53:39 +0100
+Subject: [PATCH] build with debug info
+
+---
+ hack/make/binary | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hack/make/binary b/hack/make/binary
+index 5ddce8d..75447a8 100644
+--- a/hack/make/binary
++++ b/hack/make/binary
+@@ -40,7 +40,7 @@ echo "Building: $DEST/$BINARY_FULLNAME"
+ go build \
+ 	-o "$DEST/$BINARY_FULLNAME" \
+ 	"${BUILDFLAGS[@]}" \
+-	-ldflags "
++	-ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')
+ 		$LDFLAGS
+ 		$LDFLAGS_STATIC_DOCKER
+ 	" \
+-- 
+1.9.3
+
diff --git a/docker.spec b/docker.spec
index f68f3ee..d87efb9 100644
--- a/docker.spec
+++ b/docker.spec
@@ -1,8 +1,10 @@
 %if 0%{?fedora}
 %global with_devel 1
+%global with_debug 1
 %global with_unit_test 1
 %else
 %global with_devel 0
+%global with_debug 0
 %global with_unit_test 0
 %endif
 
@@ -11,7 +13,12 @@
 
 # docker builds in a checksum of dockerinit into docker,
 # so stripping the binaries breaks docker
-%global debug_package %%{nil}
+%if 0%{?with_debug}
+# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
+%global _dwz_low_mem_die_limit 0
+%else
+%global debug_package   %{nil}
+%endif
 %global provider github
 %global provider_tld com
 %global project docker
@@ -73,7 +80,7 @@
 Name: %{repo}
 Epoch: 1
 Version: 1.10.0
-Release: 12.git%{shortcommit0}%{?dist}
+Release: 13.git%{shortcommit0}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -91,6 +98,11 @@ Source7: %{repo}-logrotate.sh
 Source8: README.%{repo}-logrotate
 Source9: %{repo}-network.sysconfig
 
+%if 0%{?with_debug}
+# Build with debug
+Patch0:      build-with-debug-info.patch
+%endif
+
 BuildRequires: git
 BuildRequires: glibc-static
 BuildRequires: go-md2man
@@ -366,8 +378,8 @@ cp contrib/syntax/vim/LICENSE LICENSE-vim-syntax
 cp contrib/syntax/vim/README.md README-vim-syntax.md
 
 pushd $(pwd)/_build/src
-go build github.com/vbatts/%{repo}-utils/cmd/%{repo}-fetch
-go build github.com/vbatts/%{repo}-utils/cmd/%{repo}tarsum
+go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" github.com/vbatts/%{repo}-utils/cmd/%{repo}-fetch
+go build -ldflags "-B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \n')" github.com/vbatts/%{repo}-utils/cmd/%{repo}tarsum
 popd
 
 %if 0%{?with_selinux}
@@ -607,6 +619,10 @@ fi
 %{_bindir}/%{repo}tarsum
 
 %changelog
+* Thu Jan 07 2016 jchaloup <jchaloup@redhat.com> - 1:1.10.0-13.gitc3726aa
+- built with debug info
+  resolves: #1236317
+
 * Thu Dec 10 2015 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.10.0-12.gitc3726aa
 - built docker @projectatomic/fedora-1.10 commit#c3726aa
 - built docker-selinux commit#d9b67f9