diff --git a/configure b/configure
index f7445474f19b1f7992c4902a3f1eb2cec497f359..c29cb1040e0b26c8798575fd860675112de272cb 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.69 for PostgreSQL 9.4.17.
+# Generated by GNU Autoconf 2.69 for PostgreSQL 9.4.18.
#
# Report bugs to <pgsql-bugs@postgresql.org>.
#
@@ -582,8 +582,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='PostgreSQL'
PACKAGE_TARNAME='postgresql'
-PACKAGE_VERSION='9.4.17'
-PACKAGE_STRING='PostgreSQL 9.4.17'
+PACKAGE_VERSION='9.4.18'
+PACKAGE_STRING='PostgreSQL 9.4.18'
PACKAGE_BUGREPORT='pgsql-bugs@postgresql.org'
PACKAGE_URL=''
@@ -1394,7 +1394,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.4.17 to adapt to many kinds of systems.
+\`configure' configures PostgreSQL 9.4.18 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1459,7 +1459,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of PostgreSQL 9.4.17:";;
+ short | recursive ) echo "Configuration of PostgreSQL 9.4.18:";;
esac
cat <<\_ACEOF
@@ -1608,7 +1608,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-PostgreSQL configure 9.4.17
+PostgreSQL configure 9.4.18
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2319,7 +2319,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.4.17, which was
+It was created by PostgreSQL $as_me 9.4.18, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -15730,7 +15730,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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.4.17, which was
+This file was extended by PostgreSQL $as_me 9.4.18, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15800,7 +15800,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-PostgreSQL config.status 9.4.17
+PostgreSQL config.status 9.4.18
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.in b/configure.in
index d79584399981e55ad73418a98b96c303c20a9c88..79a2649c52b5a19071a29ade4f81d711265ae134 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.4.17], [pgsql-bugs@postgresql.org])
+AC_INIT([PostgreSQL], [9.4.18], [pgsql-bugs@postgresql.org])
m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required.
Untested combinations of 'autoconf' and PostgreSQL versions are not
diff --git a/doc/bug.template b/doc/bug.template
index cbf152777de3b1a07f289e8379fc39e98354a951..2b9d06181e8b6b0ed5315bbf674467a641fa537d 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.4.17): PostgreSQL 9.4.17
+ PostgreSQL version (example: PostgreSQL 9.4.18): PostgreSQL 9.4.18
Compiler used (example: gcc 3.3.5) :
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 121d7758aa838fb5c7ee3572e7d115af51a9e5a7..2a1e5b396f24809f1fd5955e25b94b6abe047523 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -559,19 +559,19 @@
#define PACKAGE_NAME "PostgreSQL"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 9.4.17"
+#define PACKAGE_STRING "PostgreSQL 9.4.18"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "9.4.17"
+#define PACKAGE_VERSION "9.4.18"
/* 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.4.17"
+#define PG_VERSION "9.4.18"
/* PostgreSQL version as a number */
-#define PG_VERSION_NUM 90417
+#define PG_VERSION_NUM 90418
/* 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 94c86fce9976bb9a20c36163ca66c329e6d988ce..790e4a87e206afba1781a8de8f5f972b2c8cb7fa 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,4,17,0
- PRODUCTVERSION 9,4,17,0
+ FILEVERSION 9,4,18,0
+ PRODUCTVERSION 9,4,18,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.4.17\0"
+ VALUE "FileVersion", "9.4.18\0"
VALUE "InternalName", "libpq\0"
VALUE "LegalCopyright", "Copyright (C) 2014\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libpq.dll\0"
VALUE "ProductName", "PostgreSQL\0"
- VALUE "ProductVersion", "9.4.17\0"
+ VALUE "ProductVersion", "9.4.18\0"
END
END
BLOCK "VarFileInfo"
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index d400980b1cb09826d5a0a9a7589195f1b23ebc95..330ae5b234ae324ad0c5cd95cbe15302bc45050a 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,4,17,0
- PRODUCTVERSION 9,4,17,0
+ FILEVERSION 9,4,18,0
+ PRODUCTVERSION 9,4,18,0
FILEFLAGSMASK 0x17L
FILEFLAGS 0x0L
FILEOS VOS_NT_WINDOWS32