diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# hpqtypes-1.5.1 (2016-07-04)
+* Do not use linux/limits.h
+
 # hpqtypes-1.5.0 (2016-06-21)
 * remove orphan MonadDB instances
 * turn ConnectionSource into indexed datatype
diff --git a/hpqtypes.cabal b/hpqtypes.cabal
--- a/hpqtypes.cabal
+++ b/hpqtypes.cabal
@@ -1,5 +1,5 @@
 name:                hpqtypes
-version:             1.5.0
+version:             1.5.1
 synopsis:            Haskell bindings to libpqtypes
 
 description:         Efficient and easy-to-use bindings to (slightly modified)
diff --git a/libpqtypes/configure b/libpqtypes/configure
--- a/libpqtypes/configure
+++ b/libpqtypes/configure
@@ -20913,7 +20913,7 @@
 fi
 
 for ac_header in  \
-arpa/inet.h limits.h linux/limits.h netdb.h netinet/in.h stddef.h \
+arpa/inet.h limits.h netdb.h netinet/in.h stddef.h \
 sys/socket.h time.h math.h sys/time.h strings.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
diff --git a/libpqtypes/configure.ac b/libpqtypes/configure.ac
--- a/libpqtypes/configure.ac
+++ b/libpqtypes/configure.ac
@@ -108,7 +108,7 @@
 
 AC_HEADER_STDC
 AC_CHECK_HEADERS([ \
-arpa/inet.h limits.h linux/limits.h netdb.h netinet/in.h stddef.h \
+arpa/inet.h limits.h netdb.h netinet/in.h stddef.h \
 sys/socket.h time.h math.h sys/time.h strings.h])
 
 AC_STRUCT_TIMEZONE
diff --git a/libpqtypes/src/libpqtypes-int.h b/libpqtypes/src/libpqtypes-int.h
--- a/libpqtypes/src/libpqtypes-int.h
+++ b/libpqtypes/src/libpqtypes-int.h
@@ -92,11 +92,6 @@
 #	include <limits.h>
 #endif
 
-/* Include linux/limits.h if available */
-#if defined(HAVE_CONFIG_H) && defined(HAVE_LINUX_LIMITS_H)
-#	include <linux/limits.h>
-#endif
-
 /* Include math.h if on windows or if we have it */
 #if defined(PQT_WIN32) || defined(HAVE_MATH_H)
 #	include <math.h>
diff --git a/libpqtypes/src/pqt_config.h b/libpqtypes/src/pqt_config.h
--- a/libpqtypes/src/pqt_config.h
+++ b/libpqtypes/src/pqt_config.h
@@ -25,9 +25,6 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #define HAVE_LIMITS_H 1
 
-/* Define to 1 if you have the <linux/limits.h> header file. */
-#define HAVE_LINUX_LIMITS_H 1
-
 /* Define to 1 if you have the `localtime_r' function. */
 #define HAVE_LOCALTIME_R 1
 
diff --git a/libpqtypes/src/pqt_config.h.in b/libpqtypes/src/pqt_config.h.in
--- a/libpqtypes/src/pqt_config.h.in
+++ b/libpqtypes/src/pqt_config.h.in
@@ -24,9 +24,6 @@
 /* Define to 1 if you have the <limits.h> header file. */
 #undef HAVE_LIMITS_H
 
-/* Define to 1 if you have the <linux/limits.h> header file. */
-#undef HAVE_LINUX_LIMITS_H
-
 /* Define to 1 if you have the `localtime_r' function. */
 #undef HAVE_LOCALTIME_R