diff --git a/debian/changelog b/debian/changelog
index 184a7c6..fc33752 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+globus-xio-gridftp-driver (2.18-1) unstable; urgency=medium
+
+  * GT6 update: Use 2048 bit keys to support openssl 1.1.1
+  * Drop patch globus-xio-gridftp-driver-2048-bits.patch (accepted upstream)
+
+ -- Mattias Ellert <mattias.ellert@physics.uu.se>  Sat, 01 Sep 2018 21:16:41 +0200
+
 globus-xio-gridftp-driver (2.17-3) unstable; urgency=medium
 
   * Use 2048 bit RSA key for tests
diff --git a/debian/copyright b/debian/copyright
index e598a3c..5416a6b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,11 +1,11 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: globus_xio_gridftp_driver
 Upstream-Contact: http://toolkit.globus.org/
-Source: https://downloads.globus.org/toolkit/gt6/packages/globus_xio_gridftp_driver-2.17.tar.gz
+Source: https://downloads.globus.org/toolkit/gt6/packages/globus_xio_gridftp_driver-2.18.tar.gz
 
 Files: *
 Copyright:
- 1999-2016 University of Chicago
+ 1999-2018 University of Chicago
 License: Apache-2.0
 
 Files: debian/*
diff --git a/debian/patches/globus-xio-gridftp-driver-2048-bits.patch b/debian/patches/globus-xio-gridftp-driver-2048-bits.patch
deleted file mode 100644
index 44c636a..0000000
--- a/debian/patches/globus-xio-gridftp-driver-2048-bits.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 8d834eb21a..a73dcf7f43 100644
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -53,7 +53,7 @@ LOG_COMPILER = $(LIBTOOL) --mode=execute \
- 
- # Test Cert/Key
- .srl.key:
--	umask 077; $(OPENSSL) genrsa -out $@ 1024
-+	umask 077; $(OPENSSL) genrsa -out $@ 2048
- .key.req:
- 	$(OPENSSL) req -subj "/CN=test" -new -key $< -out $@ -config $*.cnf
- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 114085f..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-# Use 2048 bit RSA key for tests
-# https://github.com/globus/globus-toolkit/pull/122
-globus-xio-gridftp-driver-2048-bits.patch