diff --git a/.gitignore b/.gitignore
index 88bf871..ad225c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /1.5.5.tar.gz
 /2.0.2.tar.gz
 /2.1.0.tar.gz
+/2.2.0.tar.gz
diff --git a/mariadb-java-client.spec b/mariadb-java-client.spec
index 89cd954..deb4388 100644
--- a/mariadb-java-client.spec
+++ b/mariadb-java-client.spec
@@ -1,5 +1,5 @@
 Name:		mariadb-java-client
-Version:	2.1.0
+Version:	2.2.0
 Release:	1%{?dist}
 Summary:	Connects applications developed in Java to MariaDB and MySQL databases
 # added BSD license because of https://bugzilla.redhat.com/show_bug.cgi?id=1291558#c13
@@ -108,6 +108,9 @@ rm src/main/resources/META-INF/MANIFEST.MF
 %license LICENSE
 
 %changelog
+* Tue Nov 21 2017 Jakub Janco <jjanco@redhat.com> - 2.2.0-1
+- Update to 2.2.0
+
 * Tue Aug 29 2017 Tomas Repik <trepik@redhat.com> - 2.1.0-1
 - Update to 2.1.0
 
diff --git a/remove_waffle-jna.patch b/remove_waffle-jna.patch
index c2385df..37e5a0c 100644
--- a/remove_waffle-jna.patch
+++ b/remove_waffle-jna.patch
@@ -1,38 +1,38 @@
-From 560a30be0f79895d00868f7743da32302679343e Mon Sep 17 00:00:00 2001
-From: Tomas Repik <trepik@redhat.com>
-Date: Mon, 26 Jun 2017 13:56:47 +0200
-Subject: [PATCH] remove waffle-jna
+From 9e5c6cc9d3e91a7b09db5cd66c012ffc56b9aad7 Mon Sep 17 00:00:00 2001
+From: Jakub Janco <jjanco@redhat.com>
+Date: Wed, 22 Nov 2017 14:23:08 +0100
+Subject: [PATCH] Remove WindowsNativeSspiAuthentication, because this
+ dependency is not in Fedora and is optional
 
 ---
- .../internal/com/send/SendGssApiAuthPacket.java    | 31 +---------------------
- 1 file changed, 1 insertion(+), 30 deletions(-)
+ .../internal/com/send/SendGssApiAuthPacket.java    | 26 +---------------------
+ 1 file changed, 1 insertion(+), 25 deletions(-)
 
 diff --git a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
-index b739b54..65c4507 100644
+index 55771a61..d6a76979 100644
 --- a/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
 +++ b/src/main/java/org/mariadb/jdbc/internal/com/send/SendGssApiAuthPacket.java
-@@ -56,7 +56,6 @@ import org.mariadb.jdbc.internal.com.read.Buffer;
+@@ -57,7 +57,6 @@ import org.mariadb.jdbc.internal.com.read.Buffer;
  import org.mariadb.jdbc.internal.com.read.ErrorPacket;
  import org.mariadb.jdbc.internal.com.send.gssapi.GssapiAuth;
  import org.mariadb.jdbc.internal.com.send.gssapi.StandardGssapiAuthentication;
 -import org.mariadb.jdbc.internal.com.send.gssapi.WindowsNativeSspiAuthentication;
  import org.mariadb.jdbc.internal.io.input.PacketInputStream;
  import org.mariadb.jdbc.internal.io.output.PacketOutputStream;
-
+ 
 @@ -88,7 +87,7 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
          String mechanisms = buffer.readStringNullEnd(StandardCharsets.UTF_8);
-         if (mechanisms.equals("")) mechanisms = "Kerberos";
-
+         if (mechanisms.isEmpty()) mechanisms = "Kerberos";
+ 
 -        GssapiAuth gssapiAuth = getAuthenticationMethod();
 +        GssapiAuth gssapiAuth = new StandardGssapiAuthentication(reader, packSeq);
          gssapiAuth.authenticate(pos, serverPrincipalName, mechanisms);
      }
-
-@@ -106,33 +105,5 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
-             throw new SQLException("Authentication exception", "28000", 1045, e);
+ 
+@@ -107,28 +106,5 @@ public class SendGssApiAuthPacket extends AbstractAuthSwitchSendResponsePacket i
          }
      }
--
+ 
 -    /**
 -     * Get authentication method according to classpath.
 -     * Windows native authentication is using Waffle-jna.
@@ -42,11 +42,7 @@ index b739b54..65c4507 100644
 -    private GssapiAuth getAuthenticationMethod() {
 -        try {
 -            //Waffle-jna has jna as dependency, so if not available on classpath, just use standard authentication
--            Class platformClass = Class.forName("com.sun.jna.Platform");
--            @SuppressWarnings("unchecked")
--            Method method = platformClass.getMethod("isWindows");
--            Boolean isWindows = (Boolean) method.invoke(platformClass);
--            if (isWindows.booleanValue()) {
+-            if (Platform.isWindows()) {
 -                try {
 -                    Class.forName("waffle.windows.auth.impl.WindowsAuthProviderImpl");
 -                    return new WindowsNativeSspiAuthentication(reader, packSeq);
@@ -54,14 +50,14 @@ index b739b54..65c4507 100644
 -                    //waffle not in the classpath
 -                }
 -            }
--        } catch (Exception cle) {
+-        } catch (Throwable cle) {
 -            //jna jar's are not in classpath
 -        }
 -        return new StandardGssapiAuthentication(reader, packSeq);
 -    }
 -
  }
-
---
-2.9.4
+ 
+-- 
+2.13.6
 
diff --git a/sources b/sources
index f5ab062..52d9082 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (2.1.0.tar.gz) = 71cca1a352fd01b7f016b49c78182d6bfdf3d353e917d8d6fb2ec1e85e38e53b9181a1e39fb8917b1d4e7f0fc35c4d503a20b56a43d13b060240156297d345ee
+SHA512 (2.2.0.tar.gz) = 4f8cca1e384c90e713425be284070fbd3d5a9a56760c2642044e9c0db07c12bd2e0f080c13fec8ea2970b73c4ef7e6ec27a4ebb838790ff360c64e902edf7ac5