diff --git a/configure b/configure
index 28526f542fd417fb434991cdcd42c9c4b835e510..973881c0fe7147b9c56af25f8c1fde9f26ae0df7 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 9.3.5.
+# Generated by GNU Autoconf 2.63 for PostgreSQL 9.3.6.
 #
 # 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='9.3.5'
-PACKAGE_STRING='PostgreSQL 9.3.5'
+PACKAGE_VERSION='9.3.6'
+PACKAGE_STRING='PostgreSQL 9.3.6'
 PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
 
 ac_unique_file="src/backend/access/common/heaptuple.c"
@@ -1412,7 +1412,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 9.3.5 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.3.6 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1477,7 +1477,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of PostgreSQL 9.3.5:";;
+     short | recursive ) echo "Configuration of PostgreSQL 9.3.6:";;
    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 9.3.5
+PostgreSQL configure 9.3.6
 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 9.3.5, which was
+It was created by PostgreSQL $as_me 9.3.6, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   $ $0 $@
@@ -30955,7 +30955,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 9.3.5, which was
+This file was extended by PostgreSQL $as_me 9.3.6, which was
 generated by GNU Autoconf 2.63.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -31022,7 +31022,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_version="\\
-PostgreSQL config.status 9.3.5
+PostgreSQL config.status 9.3.6
 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 51f1807f965468268748511350a01f957b6f5705..d914dd07cfdb6e96bcb2787e214cd4a825fa1107 100644
--- a/configure.in
+++ b/configure.in
@@ -17,7 +17,7 @@ dnl Read the Autoconf manual for details.
 dnl
 m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 
-AC_INIT([PostgreSQL], [9.3.5], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.3.6], [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 ca21231d3d0bb71d0056f887f29167a8e1c58242..c5b5ad9af83c445f184f9c1286485270e30a19d8 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 9.3.5):  PostgreSQL 9.3.5
+  PostgreSQL version (example: PostgreSQL 9.3.6):  PostgreSQL 9.3.6
 
   Compiler used (example: gcc 3.3.5)		:
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 26bf78a2ddf5f99ac17d9efd218adf1344f59c28..7e976e3b0001d5e50a46571f32daa16c67fd6886 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -572,19 +572,19 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.3.5"
+#define PACKAGE_STRING "PostgreSQL 9.3.6"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "9.3.5"
+#define PACKAGE_VERSION "9.3.6"
 
 /* Define to the name of a signed 64-bit integer type. */
 #define PG_INT64_TYPE long long int
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "9.3.5"
+#define PG_VERSION "9.3.6"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90305
+#define PG_VERSION_NUM 90306
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "postgresql"
diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in
index 0e00cabf1f5ea16652c73dec31b0077312740e26..11e99476c07912f13d56238bed467c0b235af506 100644
--- a/src/interfaces/libpq/libpq.rc.in
+++ b/src/interfaces/libpq/libpq.rc.in
@@ -1,8 +1,8 @@
 #include <winver.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 9,3,5,0
- PRODUCTVERSION 9,3,5,0
+ FILEVERSION 9,3,6,0
+ PRODUCTVERSION 9,3,6,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0
  FILEOS VOS__WINDOWS32
@@ -15,13 +15,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "\0"
             VALUE "FileDescription", "PostgreSQL Access Library\0"
-            VALUE "FileVersion", "9.3.5\0"
+            VALUE "FileVersion", "9.3.6\0"
             VALUE "InternalName", "libpq\0"
             VALUE "LegalCopyright", "Copyright (C) 2013\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
-            VALUE "ProductVersion", "9.3.5\0"
+            VALUE "ProductVersion", "9.3.6\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 1d9b1929c93d5bf2e43a3e9c6d1b253566ba01b1..ede33643619e8f018b056688841965e12463ac40 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -2,8 +2,8 @@
 #include "pg_config.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    9,3,5,0
- PRODUCTVERSION 9,3,5,0
+ FILEVERSION    9,3,6,0
+ PRODUCTVERSION 9,3,6,0
  FILEFLAGSMASK  0x17L
  FILEFLAGS      0x0L
  FILEOS         VOS_NT_WINDOWS32