diff --git a/libgpg-error-1.17-no-buildhost.patch b/libgpg-error-1.17-no-buildhost.patch
new file mode 100644
index 0000000..12fd8b7
--- /dev/null
+++ b/libgpg-error-1.17-no-buildhost.patch
@@ -0,0 +1,12 @@
+diff -up libgpg-error-1.17/src/gpg-error.h.in.no-buildhost libgpg-error-1.17/src/gpg-error.h.in
+--- libgpg-error-1.17/src/gpg-error.h.in.no-buildhost 2014-10-03 08:14:00.000000000 +0200
++++ libgpg-error-1.17/src/gpg-error.h.in 2015-01-30 16:30:38.345980993 +0100
+@@ -16,7 +16,7 @@
+ You should have received a copy of the GNU Lesser General Public
+ License along with this program; if not, see .
+
+- @configure_input@
++ Do not edit. Generated from gpg-error.h.in.
+ */
+
+
diff --git a/libgpg-error.spec b/libgpg-error.spec
index 0effa48..30d3ad0 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -1,10 +1,11 @@
Summary: Library for error values used by GnuPG components
Name: libgpg-error
Version: 1.17
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: ftp://ftp.gnupg.org/gcrypt/libgpg-error/
Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
+Patch1: libgpg-error-1.17-no-buildhost.patch
Group: System Environment/Libraries
License: LGPLv2+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -37,6 +38,7 @@ contains files necessary to develop applications using libgpg-error.
%prep
%setup -q
+%patch1 -p1 -b .no-buildhost
# The config script already suppresses the -L if it's /usr/lib, so cheat and
# set it to a value which we know will be suppressed.
sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in
@@ -95,6 +97,9 @@ exit 0
%{_mandir}/man1/gpg-error-config.*
%changelog
+* Fri Jan 30 2015 Tomáš Mráz 1.17-2
+- do not conflict on header file between architectures (#1180857)
+
* Thu Jan 29 2015 Tomáš Mráz 1.17-1
- new upstream release