diff --git a/configure b/configure
index 83d0eaf6e0..c2cd8ca106 100755
--- a/configure
+++ b/configure
@@ -607,7 +607,7 @@ ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
 
-VERSION='7.1beta4'
+VERSION='7.1beta5'
 
 cat >> confdefs.h <<EOF
 #define PG_VERSION "$VERSION"
@@ -2641,7 +2641,7 @@ INSTALL_SHLIB="\${INSTALL} $INSTL_SHLIB_OPTS"
 
 
 
-for ac_prog in gawk mawk nawk awk
+for ac_prog in mawk gawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
@@ -4999,7 +4999,7 @@ else
 int main() {
 
 /* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x={0,0};
+typedef int charset[2]; const charset x;
 /* SunOS 4.1.1 cc rejects this.  */
 char const *const *ccp;
 char **p;
@@ -5074,7 +5074,7 @@ for ac_kw in inline __inline__ __inline; do
 #include "confdefs.h"
 
 int main() {
-} $ac_kw int foo() {
+} $ac_kw foo() {
 ; return 0; }
 EOF
 if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
diff --git a/configure.in b/configure.in
index 194ff03e7d..5671bec569 100644
--- a/configure.in
+++ b/configure.in
@@ -28,7 +28,7 @@ AC_CONFIG_HEADER(src/include/config.h)
 AC_PREREQ(2.13)
 AC_CONFIG_AUX_DIR(config)
 
-VERSION='7.1beta4'
+VERSION='7.1beta5'
 AC_SUBST(VERSION)
 AC_DEFINE_UNQUOTED(PG_VERSION, "$VERSION")