diff --git a/.gitignore b/.gitignore
index 02b7584..8b9e8b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/REL9.4.1212.tar.gz
-/REL1.1.2.tar.gz
+/REL42.1.4.tar.gz
diff --git a/disable-ConnectTimeoutTest.patch b/disable-ConnectTimeoutTest.patch
index cf9fd32..420d6ab 100644
--- a/disable-ConnectTimeoutTest.patch
+++ b/disable-ConnectTimeoutTest.patch
@@ -1,11 +1,13 @@
---- pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java.ORIG	2016-12-21 14:09:40.340533352 -0600
-+++ pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java	2016-12-21 14:10:40.239090270 -0600
-@@ -112,7 +112,7 @@
-     suite.addTestSuite(LoginTimeoutTest.class);
-     suite.addTestSuite(TestACL.class);
+diff --git a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
+index 188183a..c0e4cca 100644
+--- a/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
++++ b/pgjdbc/src/test/java/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
+@@ -104,7 +104,7 @@ import org.junit.runners.Suite;
+         LoginTimeoutTest.class,
+         TestACL.class,
  
--    suite.addTestSuite(ConnectTimeoutTest.class);
-+    // suite.addTestSuite(ConnectTimeoutTest.class);
+-        ConnectTimeoutTest.class,
++        // ConnectTimeoutTest.class,
  
-     suite.addTestSuite(PGPropertyTest.class);
+         PGPropertyTest.class,
  
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index a898fbe..e04f515 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -35,8 +35,6 @@
 
 
 %global section		devel
-%global upstreamrel	1212
-%global upstreammajor	9.4
 %global source_path	pgjdbc/src/main/java/org/postgresql
 %global parent_ver	1.1.2
 %global parent_poms_builddir	./pgjdbc-parent-poms
@@ -46,8 +44,8 @@
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:	%upstreammajor.%{upstreamrel}
-Release:	4%{?dist}
+Version:	42.1.4
+Release:	1%{?dist}
 License:	BSD
 URL:		http://jdbc.postgresql.org/
 
@@ -108,7 +106,7 @@ This package contains the API Documentation for %{name}.
 mv pgjdbc-REL%version/* .
 mv pgjdbc-parent-poms-REL%parent_ver pgjdbc-parent-poms
 
-%patch0
+%patch0 -p1
 
 # remove any binary libs
 find -name "*.jar" -or -name "*.class" | xargs rm -f
@@ -191,6 +189,9 @@ opts="-f"
 
 
 %changelog
+* Wed Aug 23 2017 Pavel Raiskup <praiskup@redhat.com> - 42.1.4-1
+- rebase to latest upstream release
+
 * Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.4.1212-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/sources b/sources
index c3060bb..d8b859c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-5d2ea09f7212e0dc2e3bd57d99187dd4  REL9.4.1212.tar.gz
-dead761ccdabcdb7ae427e7f95afc2a5  REL1.1.2.tar.gz
+SHA512 (REL42.1.4.tar.gz) = 5f3095c4df384d313a73425455c8cba3be4fe00c662b75da6b100106fcc4e41dad2edd4e14f6c801c86c503300606fc50bb4d2858c2d5d2f4d3e65fbeae55c59