diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/configure.ac gnunet-0.10.1/configure.ac
--- gnunet-0.10.1.orig/configure.ac	2014-04-08 10:55:04.000000000 +0300
+++ gnunet-0.10.1/configure.ac	2015-05-26 02:40:20.535635974 +0300
@@ -661,13 +661,13 @@
    no)
      ;;
    yes)
-    AC_CHECK_HEADERS(postgresql/libpq-fe.h,
+    AC_CHECK_HEADERS(pgsql/libpq-fe.h,
      postgres=true)
      ;;
    *)
     LDFLAGS="-L$with_postgres/lib $LDFLAGS"
     CPPFLAGS="-I$with_postgres/include $CPPFLAGS"
-    AC_CHECK_HEADERS(postgresql/libpq-fe.h,
+    AC_CHECK_HEADERS(pgsql/libpq-fe.h,
      EXT_LIB_PATH="-L$with_postgres/lib $EXT_LIB_PATH"
      POSTGRES_LDFLAGS="-L$with_postgres/lib"
      POSTGRES_CPPFLAGS="-I$with_postgres/include"
@@ -678,7 +678,7 @@
    esac
   ],
   [AC_MSG_RESULT([--with-postgres not specified])
-    AC_CHECK_HEADERS(postgresql/libpq-fe.h, postgres=true)])
+    AC_CHECK_HEADERS(pgsql/libpq-fe.h, postgres=true)])
 AM_CONDITIONAL(HAVE_POSTGRES, test x$postgres = xtrue)
 AC_SUBST(POSTGRES_CPPFLAGS)
 AC_SUBST(POSTGRES_LDFLAGS)
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/gnunet_config.h gnunet-0.10.1/gnunet_config.h
--- gnunet-0.10.1.orig/gnunet_config.h	2014-04-08 13:49:39.000000000 +0300
+++ gnunet-0.10.1/gnunet_config.h	2015-05-26 02:40:21.175626284 +0300
@@ -315,7 +315,7 @@
 /* Have libopus library */
 #define HAVE_OPUS 1
 
-/* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
+/* Define to 1 if you have the <pgsql/libpq-fe.h> header file. */
 #define HAVE_POSTGRESQL_LIBPQ_FE_H 1
 
 /* Have libpulse(audio) library */
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/gnunet_config.h.in gnunet-0.10.1/gnunet_config.h.in
--- gnunet-0.10.1.orig/gnunet_config.h.in	2014-04-08 13:49:18.000000000 +0300
+++ gnunet-0.10.1/gnunet_config.h.in	2015-05-26 02:40:20.586635202 +0300
@@ -314,7 +314,7 @@
 /* Have libopus library */
 #undef HAVE_OPUS
 
-/* Define to 1 if you have the <postgresql/libpq-fe.h> header file. */
+/* Define to 1 if you have the <pgsql/libpq-fe.h> header file. */
 #undef HAVE_POSTGRESQL_LIBPQ_FE_H
 
 /* Have libpulse(audio) library */
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datacache/plugin_datacache_postgres.c gnunet-0.10.1/src/datacache/plugin_datacache_postgres.c
--- gnunet-0.10.1.orig/src/datacache/plugin_datacache_postgres.c	2013-12-20 12:43:38.000000000 +0300
+++ gnunet-0.10.1/src/datacache/plugin_datacache_postgres.c	2015-05-26 02:40:20.570635444 +0300
@@ -27,7 +27,7 @@
 #include "gnunet_util_lib.h"
 #include "gnunet_postgres_lib.h"
 #include "gnunet_datacache_plugin.h"
-#include <postgresql/libpq-fe.h>
+#include <pgsql/libpq-fe.h>
 
 #define LOG(kind,...) GNUNET_log_from (kind, "datacache-postgres", __VA_ARGS__)
 
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/datastore/plugin_datastore_postgres.c gnunet-0.10.1/src/datastore/plugin_datastore_postgres.c
--- gnunet-0.10.1.orig/src/datastore/plugin_datastore_postgres.c	2013-12-20 12:43:38.000000000 +0300
+++ gnunet-0.10.1/src/datastore/plugin_datastore_postgres.c	2015-05-26 02:40:20.560635596 +0300
@@ -27,7 +27,7 @@
 #include "platform.h"
 #include "gnunet_datastore_plugin.h"
 #include "gnunet_postgres_lib.h"
-#include <postgresql/libpq-fe.h>
+#include <pgsql/libpq-fe.h>
 
 
 /**
diff -U 3 -H -d -r -N -- gnunet-0.10.1.orig/src/include/gnunet_postgres_lib.h gnunet-0.10.1/src/include/gnunet_postgres_lib.h
--- gnunet-0.10.1.orig/src/include/gnunet_postgres_lib.h	2013-10-11 16:38:11.000000000 +0300
+++ gnunet-0.10.1/src/include/gnunet_postgres_lib.h	2015-05-26 02:40:20.539635914 +0300
@@ -26,7 +26,7 @@
 #define GNUNET_POSTGRES_LIB_H
 
 #include "gnunet_util_lib.h"
-#include <postgresql/libpq-fe.h>
+#include <pgsql/libpq-fe.h>
 
 #ifdef __cplusplus
 extern "C"