diff --git a/.gitignore b/.gitignore
index aef6cbf..b9eb1d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,52 +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
 /dab51acd1b1a77f7cb01a1b7e2129ec85c846b71.tar.gz
-/docker-3c1d7c8.tar.gz
-/docker-selinux-16ebd81.tar.gz
-/docker-storage-setup-ac1b30e.tar.gz
-/docker-32b8b25.tar.gz
-/docker-selinux-6267b83.tar.gz
-/docker-storage-setup-d3b9ba7.tar.gz
-/docker-f1db8f2.tar.gz
-/docker-selinux-b5281b7.tar.gz
-/docker-storage-setup-6898d43.tar.gz
-/docker-d449443.tar.gz
-/docker-cb216be.tar.gz
-/docker-selinux-d6560f8.tar.gz
-/docker-selinux-2ed73eb.tar.gz
-/docker-selinux-44abd21.tar.gz
-/docker-bdb52b6.tar.gz
-/docker-selinux-fe61432.tar.gz
-/docker-storage-setup-01df512.tar.gz
-/docker-28c300f.tar.gz
-/docker-selinux-dbfad05.tar.gz
-/docker-storage-setup-e9722cc.tar.gz
-/docker-8f9eabc.tar.gz
-/docker-78bc3ea.tar.gz
 /docker-storage-setup-0814c26.tar.gz
-/docker-6ec29ef.tar.gz
 /docker-selinux-441f312.tar.gz
+/docker-6ec29ef.tar.gz
diff --git a/compile-on-i686.patch b/compile-on-i686.patch
new file mode 100644
index 0000000..a4686d5
--- /dev/null
+++ b/compile-on-i686.patch
@@ -0,0 +1,13 @@
+Index: docker-6ec29ef9a2d48a6ccd716a2bbb00a1ed07412d6a/api/server/credentials_linux.go
+===================================================================
+--- docker-6ec29ef9a2d48a6ccd716a2bbb00a1ed07412d6a.orig/api/server/credentials_linux.go
++++ docker-6ec29ef9a2d48a6ccd716a2bbb00a1ed07412d6a/api/server/credentials_linux.go
+@@ -213,7 +213,7 @@ func (s *Server) LogAction(w http.Respon
+ 			break
+ 		}
+ 		message = fmt.Sprintf("LoginUID=%v, %s", loginuid, message)
+-		if loginuid == 0xffffffff { // -1 means no login user
++		if uint32(loginuid) == 0xffffffff { // -1 means no login user
+ 			//No login UID is set, so no point in looking up a name
+ 			break
+ 		}
diff --git a/docker.spec b/docker.spec
index 4a07a71..7ae7c55 100644
--- a/docker.spec
+++ b/docker.spec
@@ -64,7 +64,7 @@
 Name: %{repo}
 Epoch: 1
 Version: 1.9.1
-Release: 3.git%{d_shortcommit}%{?dist}
+Release: 4.git%{d_shortcommit}%{?dist}
 Summary: Automates deployment of containerized applications
 License: ASL 2.0
 URL: https://%{provider}.%{provider_tld}/projectatomic/%{repo}
@@ -77,6 +77,7 @@ Source4: %{repo}-logrotate.sh
 Source5: README.%{repo}-logrotate
 Source6: %{repo}-network.sysconfig
 Patch0: muldefs.patch
+Patch1: compile-on-i686.patch
 
 %if 0%{?with_selinux}
 Source7: https://%{provider}.%{provider_tld}/fedora-cloud/%{repo}-selinux/archive/%{ds_commit}/%{repo}-selinux-%{ds_shortcommit}.tar.gz
@@ -599,6 +600,9 @@ fi
 %{_bindir}/%{repo}tarsum
 
 %changelog
+* Wed Dec 09 2015 Michal Minar <miminar@redhat.com> 1:1.9.1-4.git6ec29ef
+- Made it compilable on i686.
+
 * Wed Dec 02 2015 Lokesh Mandvekar <lsm5@fedoraproject.org> - 1:1.9.1-3.git6ec29ef
 - built docker @projectatomic/fedora-1.9 commit#6ec29ef
 - built docker-selinux commit#441f312