diff --git a/configure b/configure
index c63e12076ee84174242efbe3253fd88b23759fe3..c2067c1ee18a3c34b1cb203716ecaef96d6a3a5f 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 273055 .
+# From configure.ac Revision: 276731 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for asterisk trunk.
 #
@@ -18088,6 +18088,60 @@ done
 
 fi
 
+{ echo "$as_me:$LINENO: checking for LLONG_MAX in limits.h" >&5
+echo $ECHO_N "checking for LLONG_MAX in limits.h... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <limits.h>
+int
+main ()
+{
+long long foo = LLONG_MAX
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_LLONG_MAX 1
+_ACEOF
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+
 { echo "$as_me:$LINENO: checking for timersub in time.h" >&5
 echo $ECHO_N "checking for timersub in time.h... $ECHO_C" >&6; }
 cat >conftest.$ac_ext <<_ACEOF
diff --git a/configure.ac b/configure.ac
index 98005f015fff32e07aab5dfd5f9fbce77091e102..4bfac0af8cc4273926604670516702e66de9aaf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -462,6 +462,15 @@ if test "x${ac_cv_type_long_double_wider}" = "xyes" ; then
 	AC_CHECK_FUNCS([exp2l log2l exp10l log10l sinl cosl tanl asinl acosl atanl atan2l powl sqrtl rintl expl logl remainderl fmodl roundl truncl floorl ceill])
 fi
 
+AC_MSG_CHECKING(for LLONG_MAX in limits.h)
+AC_LINK_IFELSE(
+	AC_LANG_PROGRAM([#include <limits.h>],
+		[long long foo = LLONG_MAX]),
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([HAVE_LLONG_MAX], 1, [Define to 1 if limits.h includes a LLONG_MAX definition.]),
+	AC_MSG_RESULT(no)
+)
+
 AC_MSG_CHECKING(for timersub in time.h)
 AC_LINK_IFELSE(
 	AC_LANG_PROGRAM([#include <sys/time.h>],
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index 7ebd290cfcd557d894e4543b97b7698118de03ed..1e2e11416e66925765067148913e84dd5b13d164 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -369,6 +369,9 @@
 /* Define to 1 if your system has linux/compiler.h. */
 #undef HAVE_LINUX_COMPILER_H
 
+/* Define to 1 if limits.h includes a LLONG_MAX definition. */
+#undef HAVE_LLONG_MAX
+
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H
 
diff --git a/include/asterisk/compat.h b/include/asterisk/compat.h
index c1f9632e79b532a772e6e2756ec9909cdd77a7fb..22daeaef98a1bbbd9b271df526952bf702767adf 100644
--- a/include/asterisk/compat.h
+++ b/include/asterisk/compat.h
@@ -73,6 +73,10 @@
 #include "asterisk/poll-compat.h"
 #endif
 
+#ifndef HAVE_LLONG_MAX
+#define	LLONG_MAX	9223372036854775807LL
+#endif
+
 #ifndef HAVE_CLOSEFROM
 void closefrom(int lowfd);
 #endif