diff --git a/0009-gcc5.patch b/0009-gcc5.patch
new file mode 100644
index 0000000..72a37e2
--- /dev/null
+++ b/0009-gcc5.patch
@@ -0,0 +1,22 @@
+Index: openldap-2.4.39/build/openldap.m4
+===================================================================
+--- openldap-2.4.39.orig/build/openldap.m4	2014-01-25 14:36:15.000000000 +0100
++++ openldap-2.4.39/build/openldap.m4	2015-02-19 10:58:35.128769091 +0100
+@@ -328,7 +328,7 @@ AC_DEFUN([OL_BDB_HEADER_VERSION],
+ #endif
+ __db_version DB_VERSION_MAJOR
+ ])
+-	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
++	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
+ 	ol_cv_bdb_major=${3}
+ ])
+ case $ol_cv_bdb_major in [[1-9]]*) : ;; *)
+@@ -344,7 +344,7 @@ AC_CACHE_CHECK([for Berkeley DB minor ve
+ #endif
+ __db_version DB_VERSION_MINOR
+ ])
+-	set X `eval "$ac_cpp conftest.$ac_ext" | $EGREP __db_version` none none
++	set X `eval "$ac_cpp -P conftest.$ac_ext" | $EGREP __db_version` none none
+ 	ol_cv_bdb_minor=${3}
+ ])
+ case $ol_cv_bdb_minor in [[0-9]]*) : ;; *)
diff --git a/openldap2-client.changes b/openldap2-client.changes
index b71794a..97e8b34 100644
--- a/openldap2-client.changes
+++ b/openldap2-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 19 10:03:30 UTC 2015 - rguenther@suse.com
+
+- Add 0009-gcc5.patch to pass -P to the preprocessor in configure checks
+  for Berkeley DB version
+
 -------------------------------------------------------------------
 Wed Nov 26 11:21:34 UTC 2014 - jengelh@inai.de
 
diff --git a/openldap2-client.spec b/openldap2-client.spec
index 41e5cf4..23d08d2 100644
--- a/openldap2-client.spec
+++ b/openldap2-client.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openldap2-client
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,6 +48,7 @@ Patch5:         0005-pie-compile.dif
 Patch6:         0006-No-Build-date-and-time-in-binaries.dif
 Patch7:         0007-Recover-on-DB-version-change.dif
 Patch8:         0008-ITS-7723-fix-reference-counting.patch
+Patch9:         0009-gcc5.patch
 Patch100:       openldap-2.3.37.dif
 Patch101:       openldap-2.3.37-libldap-suid.diff
 Patch102:       openldap-2.3.37-libldap-ldapi_url.dif
@@ -209,6 +210,7 @@ This package contains the OpenLDAP client libraries.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 cp %{SOURCE5} .
 cp %{SOURCE6} .
 cd ../openldap-2.3.37
diff --git a/openldap2.changes b/openldap2.changes
index b71794a..97e8b34 100644
--- a/openldap2.changes
+++ b/openldap2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb 19 10:03:30 UTC 2015 - rguenther@suse.com
+
+- Add 0009-gcc5.patch to pass -P to the preprocessor in configure checks
+  for Berkeley DB version
+
 -------------------------------------------------------------------
 Wed Nov 26 11:21:34 UTC 2014 - jengelh@inai.de
 
diff --git a/openldap2.spec b/openldap2.spec
index 1942dab..ff26711 100644
--- a/openldap2.spec
+++ b/openldap2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openldap2
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -48,6 +48,7 @@ Patch5:         0005-pie-compile.dif
 Patch6:         0006-No-Build-date-and-time-in-binaries.dif
 Patch7:         0007-Recover-on-DB-version-change.dif
 Patch8:         0008-ITS-7723-fix-reference-counting.patch
+Patch9:         0009-gcc5.patch
 Patch100:       openldap-2.3.37.dif
 Patch101:       openldap-2.3.37-libldap-suid.diff
 Patch102:       openldap-2.3.37-libldap-ldapi_url.dif
@@ -209,6 +210,7 @@ This package contains the OpenLDAP client libraries.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 cp %{SOURCE5} .
 cp %{SOURCE6} .
 cd ../openldap-2.3.37