diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index ef94669..49ebfc7 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -47,7 +47,7 @@
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
 Version:	%upstreammajor.%{upstreamrel}
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	BSD
 URL:		http://jdbc.postgresql.org/
 
@@ -58,6 +58,10 @@ Source0:	https://github.com/pgjdbc/pgjdbc/archive/REL%version.tar.gz
 # having separate spec file for it, too.
 Source1:	https://github.com/pgjdbc/pgjdbc-parent-poms/archive/REL%parent_ver.tar.gz
 
+# disable test that makes unpredictable assumptions about non-routable IPs
+# See https://github.com/pgjdbc/pgjdbc/issues/556
+Patch0:         disable-ConnectTimeoutTest.patch
+
 BuildArch:	noarch
 BuildRequires:	java-devel >= 1.8
 BuildRequires:	maven-local
@@ -104,6 +108,8 @@ This package contains the API Documentation for %{name}.
 mv pgjdbc-REL%version/* .
 mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms
 
+%patch0
+
 # remove any binary libs
 find -name "*.jar" -or -name "*.class" | xargs rm -f
 
@@ -185,6 +191,10 @@ opts="-f"
 
 
 %changelog
+* Thu Dec 22 2016 Pavel Raiskup <praiskup@redhat.com> - 9.4.1212-2
+- Disable unpredictable test to fix FTBFS (BZ#1406931),
+  patch by Merlin Mathesius
+
 * Thu Nov 03 2016 Pavel Raiskup <praiskup@redhat.com> - 9.4.1212-1
 - new release, rhbz#1377317, per announcement:
   https://www.postgresql.org/message-id/CAB=Je-FjbvQ_MmAGmhZ-1sSMnodpjr9Uz6Q=faxqCxOvpRO-UQ@mail.gmail.com