diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11bf5463f..46ec74e28 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ __No Release Date Set__
 
 * Fixed an issue where specifying `--no-archive-check` would throw a configuration error. _Reported by Jason O'Donnell_.
 
+* Provisional support for PostgreSQL 9.5. No support for `archive_mode = 'always'` or `.partial` WAL on a standby.
+
 ## v0.89: Timeout Bug Fix and Restore Read-Only Repositories
 __Released December 24, 2015__
 
diff --git a/doc/xml/change-log.xml b/doc/xml/change-log.xml
index 6b808d5c0..41c086f77 100644
--- a/doc/xml/change-log.xml
+++ b/doc/xml/change-log.xml
@@ -11,6 +11,9 @@
                 <release-feature>
                     <text>Fixed an issue where specifying <setting>--no-archive-check</setting> would throw a configuration error.  <i>Reported by Jason O'Donnell</i>.</text>
                 </release-feature>
+                <release-feature>
+                    <text>Provisional support for <postgres/> 9.5.  No support for <setting>archive_mode = 'always'</setting> or <file>.partial</file> WAL on a standby.</text>
+                </release-feature>
             </release-feature-bullet-list>
         </changelog-release>
 
diff --git a/doc/xml/test.xml b/doc/xml/test.xml
index 670f5b966..4c87ae7fc 100644
--- a/doc/xml/test.xml
+++ b/doc/xml/test.xml
@@ -23,7 +23,7 @@ vagrant up
 vagrant ssh
         </code-block>
 
-        <p>The <code>vagrant up</code> step could take some time as a number of Docker containers must also be built.  The <code>vagrant up</code> command automatically logs onto the VM.</p>
+        <p>The <code>vagrant up</code> command may take some time as a number of Docker containers must also be built.  The <code>vagrant ssh</code> command automatically logs onto the VM.</p>
 
         <code-block title="Run All Tests">
 /backrest/test/test.pl
diff --git a/lib/BackRest/Db.pm b/lib/BackRest/Db.pm
index 79dd77d5a..d91d6bd9c 100644
--- a/lib/BackRest/Db.pm
+++ b/lib/BackRest/Db.pm
@@ -452,15 +452,14 @@ sub info
         close($hFile);
 
         # Make sure the control version is supported
-        if ($iControlVersion == 942 && $iCatalogVersion == 201409291)
-        {
-            $fDbVersion = '9.4';
-        }
-        # Leave 9.5 catalog version out until it stabilizes (then move 9.5 to the top of the list)
-        elsif ($iControlVersion == 942) # && $iCatalogVersion == 201505311)
+        if ($iControlVersion == 942 && $iCatalogVersion == 201510051)
         {
             $fDbVersion = '9.5';
         }
+        elsif ($iControlVersion == 942 && $iCatalogVersion == 201409291)
+        {
+            $fDbVersion = '9.4';
+        }
         elsif ($iControlVersion == 937 && $iCatalogVersion == 201306121)
         {
             $fDbVersion = '9.3';
diff --git a/test/README.md b/test/README.md
index 45e3344fb..6b4f45912 100644
--- a/test/README.md
+++ b/test/README.md
@@ -18,7 +18,7 @@ cd test
 vagrant up
 vagrant ssh
 ```
-The `vagrant up` step could take some time as a number of Docker containers must also be built. The `vagrant up` command automatically logs onto the VM.
+The `vagrant up` command may take some time as a number of Docker containers must also be built. The `vagrant ssh` command automatically logs onto the VM.
 
 _Run All Tests_:
 ```
diff --git a/test/lib/BackRestTest/Docker/Container.pm b/test/lib/BackRestTest/Docker/Container.pm
index 958307141..a47b7b4c9 100755
--- a/test/lib/BackRestTest/Docker/Container.pm
+++ b/test/lib/BackRestTest/Docker/Container.pm
@@ -274,7 +274,8 @@ sub containerBuild
                 "RUN rpm -ivh http://yum.postgresql.org/9.1/redhat/rhel-6-x86_64/pgdg-centos91-9.1-4.noarch.rpm\n" .
                 "RUN rpm -ivh http://yum.postgresql.org/9.2/redhat/rhel-6-x86_64/pgdg-centos92-9.2-6.noarch.rpm\n" .
                 "RUN rpm -ivh http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-1.noarch.rpm\n" .
-                "RUN rpm -ivh http://yum.postgresql.org/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-1.noarch.rpm";
+                "RUN rpm -ivh http://yum.postgresql.org/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-1.noarch.rpm\n" .
+                "RUN rpm -ivh http://yum.postgresql.org/9.5/redhat/rhel-6-x86_64/pgdg-centos95-9.5-2.noarch.rpm";
         }
         elsif ($strOS eq OS_CO7)
         {
@@ -294,7 +295,7 @@ sub containerBuild
             $strImage .=
                 "RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ " .
                     ($strOS eq OS_U12 ? 'precise' : 'trusty') .
-                    "-pgdg main 9.5' >> /etc/apt/sources.list.d/pgdg.list\n" .
+                    "-pgdg main' >> /etc/apt/sources.list.d/pgdg.list\n" .
                 "RUN wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -\n" .
                 "RUN apt-get update";
         }
@@ -386,7 +387,8 @@ sub containerBuild
                 "RUN yum -y install postgresql91-server\n" .
                 "RUN yum -y install postgresql92-server\n" .
                 "RUN yum -y install postgresql93-server\n" .
-                "RUN yum -y install postgresql94-server";
+                "RUN yum -y install postgresql94-server\n" .
+                "RUN yum -y install postgresql95-server";
         }
         elsif ($strOS eq OS_CO7)
         {
@@ -398,6 +400,8 @@ sub containerBuild
         elsif ($strOS eq OS_U12)
         {
             $strImage .=
+                "RUN apt-get install -y postgresql-9.5\n" .
+                "RUN pg_dropcluster --stop 9.5 main\n" .
                 "RUN apt-get install -y postgresql-9.4\n" .
                 "RUN pg_dropcluster --stop 9.4 main\n" .
                 "RUN apt-get install -y postgresql-9.3\n" .