diff --git a/configure b/configure
index c70e66fd1c..35e463f47b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for PostgreSQL 8.5devel.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 8.5alpha2.
 #
 # Report bugs to <pgsql-bugs@postgresql.org>.
 #
@@ -598,8 +598,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='PostgreSQL'
 PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='8.5devel'
-PACKAGE_STRING='PostgreSQL 8.5devel'
+PACKAGE_VERSION='8.5alpha2'
+PACKAGE_STRING='PostgreSQL 8.5alpha2'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1410,7 +1410,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures PostgreSQL 8.5devel to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 8.5alpha2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1475,7 +1475,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 8.5devel:";;
+     short | recursive ) echo "Configuration of PostgreSQL 8.5alpha2:";;
    esac
   cat <<\_ACEOF
 
@@ -1623,7 +1623,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-PostgreSQL configure 8.5devel
+PostgreSQL configure 8.5alpha2
 generated by GNU Autoconf 2.63
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1639,7 +1639,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by PostgreSQL $as_me 8.5devel, which was
+It was created by PostgreSQL $as_me 8.5alpha2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -29057,7 +29057,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by PostgreSQL $as_me 8.5devel, which was
+This file was extended by PostgreSQL $as_me 8.5alpha2, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29124,7 +29124,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-PostgreSQL config.status 8.5devel
+PostgreSQL config.status 8.5alpha2
 configured by $0, generated by GNU Autoconf 2.63,
   with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.in b/configure.in
index 0342b60bfd..d4773ddacd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.612 2009/10/01 01:58:57 tgl Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.612.2.1 2009/10/21 19:56:21 petere Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [8.5devel], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [8.5alpha2], [pgsql-bugs@postgresql.org])
 
 m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.63], [], [m4_fatal([Autoconf version 2.63 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/doc/bug.template b/doc/bug.template
index 1b65f62c06..8a4df46f3a 100644
--- a/doc/bug.template
+++ b/doc/bug.template
@@ -27,7 +27,7 @@ System Configuration:
 
   Operating System (example: Linux 2.4.18)	:
 
-  PostgreSQL version (example: PostgreSQL 8.5devel):  PostgreSQL 8.5devel
+  PostgreSQL version (example: PostgreSQL 8.5alpha2):  PostgreSQL 8.5alpha2
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index a3b3b7374b..9b3184550f 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -560,13 +560,13 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 8.5devel"
+#define PACKAGE_STRING "PostgreSQL 8.5alpha2"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "8.5devel"
+#define PACKAGE_VERSION "8.5alpha2"
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "8.5devel"
+#define PG_VERSION "8.5alpha2"
 
 /* PostgreSQL version as a number */
 #define PG_VERSION_NUM 80500