diff --git a/SOURCES/volume_key-0.3.9-config.h.patch b/SOURCES/volume_key-0.3.9-config.h.patch
new file mode 100644
index 0000000..8cd5a62
--- /dev/null
+++ b/SOURCES/volume_key-0.3.9-config.h.patch
@@ -0,0 +1,28 @@
+From 942017c862373a4ad03ed9fe05f274a1156d5b27 Mon Sep 17 00:00:00 2001
+From: Sebastian Kisela <skisela@redhat.com>
+Date: Mon, 9 Oct 2017 16:06:11 +0200
+Subject: [PATCH] Do not include config.h in libvolume_key.h
+
+The library's header file distributed in the devel package cannot include
+the config.h file that is only available during build otherwise it's not
+possible to use the library outside of the volume_key build process.
+---
+ lib/libvolume_key.h | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/libvolume_key.h b/lib/libvolume_key.h
+index 657b626..513f923 100644
+--- a/lib/libvolume_key.h
++++ b/lib/libvolume_key.h
+@@ -18,8 +18,6 @@ Author: Miloslav Trmač <mitr@redhat.com> */
+ #ifndef LIBVOLUME_KEY_H__
+ #define LIBVOLUME_KEY_H__
+ 
+-#include <config.h>
+-
+ #include <cert.h>
+ #include <glib.h>
+ 
+-- 
+2.9.5
+
diff --git a/SPECS/volume_key.spec b/SPECS/volume_key.spec
index 3db0434..9dd8540 100644
--- a/SPECS/volume_key.spec
+++ b/SPECS/volume_key.spec
@@ -3,7 +3,7 @@
 Summary: An utility for manipulating storage encryption keys and passphrases
 Name: volume_key
 Version: 0.3.9
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv2
 Group: Applications/System
 URL: https://fedorahosted.org/volume_key/
@@ -13,6 +13,8 @@ Source0: https://fedorahosted.org/releases/v/o/volume_key/volume_key-%{version}.
 # Upstream commit 04991fe8c4f77c4e5c7874c2db8ca32fb4655f6e
 Patch1: volume_key-0.3.9-fips-crash.patch
 Patch2: volume_key-0.3.9-translation-updates.patch
+# Upstream commit 8f8698aba19b501f01285e9eec5c18231fc6bcea
+Patch3: volume_key-0.3.9-config.h.patch
 BuildRequires: cryptsetup-luks-devel, gettext-devel, glib2-devel, /usr/bin/gpg
 BuildRequires: gpgme-devel, libblkid-devel, nss-devel, python-devel
 
@@ -80,6 +82,7 @@ for other formats is possible, some formats are planned for future releases.
 
 %patch1 -p1 -b .fips-crash
 %patch2 -p2 -b .translation-updates
+%patch3 -p1 -b .config.h
 # The patch touches both .pot and .po files, make sure the .pot file is older
 # to avoid po/Makefile running (msgmerge --update); otherwise the set of
 # (msgemrge --update)'d files changes from build to build, depending on precise
@@ -125,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/volume_key.py*
 
 %changelog
+* Mon Oct 09 2017 skisela@redhat.com - 0.3.9-8
+- Don't #include <config.h> in libvolume_key.h
+  Resolves: #1498783
+
 * Fri Jan 24 2014 Daniel Mach <dmach@redhat.com> - 0.3.9-7
 - Mass rebuild 2014-01-24