diff --git a/configure.ac b/configure.ac
index 4e708cc3..22dd2e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_CHECK_HEADERS(endian.h sys/endian.h arpa/inet.h sys/poll.h syslog.h)
 AC_CHECK_HEADERS(alloca.h pthread.h stdio.h math.h signal.h sys/prctl.h)
 AC_CHECK_HEADERS(sys/types.h sys/socket.h sys/stat.h linux/un.h netdb.h)
 AC_CHECK_HEADERS(stdint.h netinet/in.h netinet/tcp.h sys/ioctl.h)
+AC_CHECK_HEADERS(libpq-fe.h postgresql/libpq-fe.h)
 
 PTHREAD_LIBS="-lpthread"
 MATH_LIBS="-lm"
diff --git a/src/ckdb.c b/src/ckdb.c
index ff60756c..58a80371 100644
--- a/src/ckdb.c
+++ b/src/ckdb.c
@@ -23,7 +23,11 @@
 #include <string.h>
 #include <unistd.h>
 #include <regex.h>
+#ifdef HAVE_LIBPQ_FE_H
 #include <libpq-fe.h>
+#elif defined (HAVE_POSTGRESQL_LIBPQ_FE_H)
+#include <postgresql/libpq-fe.h>
+#endif
 
 #include "ckpool.h"
 #include "libckpool.h"