diff --git a/.gitignore b/.gitignore
index ead38f8..6256606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /pgjdbc-v42.3.0-rc2.tar.gz
 /postgresql-42.2.15-jdbc-src.tar.gz
 /postgresql-42.2.16-jdbc-src.tar.gz
+/postgresql-42.2.18-jdbc-src.tar.gz
diff --git a/postgresql-jdbc.spec b/postgresql-jdbc.spec
index 40a01ff..1eb6247 100644
--- a/postgresql-jdbc.spec
+++ b/postgresql-jdbc.spec
@@ -48,7 +48,7 @@
 
 Summary:	JDBC driver for PostgreSQL
 Name:		postgresql-jdbc
-Version:  42.2.16
+Version:  42.2.18
 Release:	1%{?dist}
 License:	BSD
 URL:		http://jdbc.postgresql.org/
@@ -60,7 +60,6 @@ BuildArch:	noarch
 BuildRequires:	java-devel >= 1.8
 BuildRequires:	maven-local
 BuildRequires:	maven-javadoc-plugin
-BuildRequires:	java-comment-preprocessor
 BuildRequires:	maven-enforcer-plugin
 BuildRequires:	maven-plugin-bundle
 BuildRequires:	classloader-leak-test-framework
@@ -165,6 +164,9 @@ opts="-f"
 
 
 %changelog
+* Tue Oct 20 2020 Ondrej Dubaj <odubaj@redhat.com> - 42.2.18-1
+- rebase to version 42.2.18
+
 * Wed Aug 26 2020 Ondrej Dubaj <odubaj@redhat.com> - 42.2.16-1
 - rebased to version 42.2.16
 
diff --git a/sources b/sources
index 34b3230..59f962f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (postgresql-42.2.16-jdbc-src.tar.gz) = 41e8be4f83b01f96ccb1c80f8616087e26f2fc04ecb3a7ea5766632614956b92eb5efed76d448d44a2329f7b76dde0642f670892d58094e9b4fb0fcfbc06119c
+SHA512 (postgresql-42.2.18-jdbc-src.tar.gz) = 694458f9b58a1470f0fd2c77870bf73f21818a5112d446ddabb819730616be7e2f038ed132c970ba4285fb4c956c4e8a888b664270eb6493510d1e14d30a4961