diff --git a/auto/types/maxvalue b/auto/types/maxvalue
deleted file mode 100644
index 91752a2..0000000
--- a/auto/types/maxvalue
+++ /dev/null
@@ -1,6 +0,0 @@
-
-cat << END >> $NGX_AUTO_CONFIG_H
-
-#ifndef $ngx_type_max_value
-#define $ngx_type_max_value  $ngx_max_size
-#endif
diff --git a/auto/types/sizeof b/auto/types/sizeof
index ebb0fa9..102f343 100644
--- a/auto/types/sizeof
+++ b/auto/types/sizeof
@@ -3,14 +3,15 @@
 echo >> $NGX_ERR
 echo "checking for $ngx_type size" >> $NGX_ERR
 
-ngx_bytes=
+ngx_size=
 
 cat << END > $NGX_AUTOTEST.c
 
 #include <sys/types.h>
 #include <sys/time.h>
-#include <sys/resource.h>
 $NGX_UNISTD_H
+#include <signal.h>
+#include <sys/resource.h>
 $NGX_INTTYPES_H
 $NGX_AUTO_CONFIG
 
@@ -24,27 +25,31 @@
 eval "$CC $CC_TEST_FLAGS -o $NGX_AUTOTEST $NGX_AUTOTEST.c >> $NGX_ERR 2>&1"
 
 if [ -x $NGX_AUTOTEST ]; then
-    ngx_bytes=`$NGX_AUTOTEST`
-    echo " $ngx_bytes bytes"
+    ngx_size=`$NGX_AUTOTEST`
+    echo " $ngx_size bytes"
 fi
 
 rm $NGX_AUTOTEST*
 
-case $ngx_bytes in
+case $ngx_size in
     4)
         if [ "$ngx_type"="long" ]; then
-            ngx_max_size=2147483647L
+            ngx_max_value=2147483647L
         else
-            ngx_max_size=2147483647
+            ngx_max_value=2147483647
         fi
+
+        ngx_max_len='sizeof("-2147483648") - 1'
     ;;
 
     8)
         if [ "$ngx_type"="long long" ]; then
-            ngx_max_size=9223372036854775807LL
+            ngx_max_value=9223372036854775807LL
         else
-            ngx_max_size=9223372036854775807L
+            ngx_max_value=9223372036854775807L
         fi
+
+        ngx_max_len='sizeof("-9223372036854775808") - 1'
     ;;
 
     *)
diff --git a/auto/types/typedef b/auto/types/typedef
index 531bb7e..2bf67cf 100644
--- a/auto/types/typedef
+++ b/auto/types/typedef
@@ -10,8 +10,8 @@
 
     cat << END > $NGX_AUTOTEST.c
 
-#include <signal.h>
 #include <sys/types.h>
+#include <signal.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/resource.h>
diff --git a/auto/types/uintptr_t b/auto/types/uintptr_t
index f46ffb6..cd2df8d 100644
--- a/auto/types/uintptr_t
+++ b/auto/types/uintptr_t
@@ -30,7 +30,7 @@
 
 
 if [ $found = no ]; then
-    found="uint`expr 8 \* $ngx_ptr_bytes`_t"
+    found="uint`expr 8 \* $ngx_ptr_size`_t"
     echo ", $found used"
 
     echo "typedef $found  uintptr_t;"   >> $NGX_AUTO_CONFIG_H
diff --git a/auto/types/value b/auto/types/value
new file mode 100644
index 0000000..c08012c
--- /dev/null
+++ b/auto/types/value
@@ -0,0 +1,6 @@
+
+cat << END >> $NGX_AUTO_CONFIG_H
+
+#ifndef $ngx_param
+#define $ngx_param  $ngx_value
+#endif