diff --git a/curl-7.21.7.tar.lzma b/curl-7.21.7.tar.lzma
deleted file mode 100644
index c86691f..0000000
--- a/curl-7.21.7.tar.lzma
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b85e3eca6a57e5dcc11625bfbd1252fef65556e1a21556819de135dcf46befe
-size 1893556
diff --git a/curl-7.22.0.tar.lzma b/curl-7.22.0.tar.lzma
new file mode 100644
index 0000000..ddf8040
--- /dev/null
+++ b/curl-7.22.0.tar.lzma
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1c44c437374958fa3bc91fbcad2ac9c64f3b4e9ddf54d1efe252be76a58a5776
+size 1910085
diff --git a/curl-fix-m4.patch b/curl-fix-m4.patch
new file mode 100644
index 0000000..8e6102b
--- /dev/null
+++ b/curl-fix-m4.patch
@@ -0,0 +1,27 @@
+From 0a8361df11617fe0a59687b00f020a8e9f15e83f Mon Sep 17 00:00:00 2001
+From: Dominique Leuenberger <dimstar@opensuse.org>
+Date: Mon, 3 Oct 2011 17:53:43 +0200
+Subject: [PATCH] m4: Use x in order to avoid variable 'x' set but not used
+ [-Werror=unused-but-set-variable]
+
+This error could be caused by configure scripts being run with -Werror
+-Wall, which would lead to libcurl being detected as unusable.
+---
+ docs/libcurl/libcurl.m4 |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/docs/libcurl/libcurl.m4 b/docs/libcurl/libcurl.m4
+index 01a0575..8cada05 100644
+--- a/docs/libcurl/libcurl.m4
++++ b/docs/libcurl/libcurl.m4
+@@ -157,6 +157,7 @@ x=CURLOPT_FILE;
+ x=CURLOPT_ERRORBUFFER;
+ x=CURLOPT_STDERR;
+ x=CURLOPT_VERBOSE;
++if (x) ;
+ ])],libcurl_cv_lib_curl_usable=yes,libcurl_cv_lib_curl_usable=no)
+ 
+            CPPFLAGS=$_libcurl_save_cppflags
+-- 
+1.7.6.4
+
diff --git a/curl-openssl-release-buffers.patch b/curl-openssl-release-buffers.patch
deleted file mode 100644
index 2914f7e..0000000
--- a/curl-openssl-release-buffers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lib/ssluse.c.orig
-+++ lib/ssluse.c
-@@ -1492,6 +1492,10 @@ ossl_connect_step1(struct connectdata *c
-     return CURLE_OUT_OF_MEMORY;
-   }
- 
-+#ifdef SSL_MODE_RELEASE_BUFFERS
-+  SSL_CTX_set_mode(connssl->ctx, SSL_MODE_RELEASE_BUFFERS);
-+#endif
-+
- #ifdef SSL_CTRL_SET_MSG_CALLBACK
-   if(data->set.fdebug && data->set.verbose) {
-     /* the SSL trace callback is only used for verbose logging so we only
diff --git a/curl.changes b/curl.changes
index 122c29f..3bf8688 100644
--- a/curl.changes
+++ b/curl.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Oct  3 15:44:17 UTC 2011 - dimstar@opensuse.org
+
+- Update to version 7.22.0:
+  + Added CURLOPT_GSSAPI_DELEGATION
+  + Added support for NTLM delegation to Samba's winbind daemon
+    helper ntlm_auth
+  + Display notes from setup file in testcurl.pl
+  + BSD-style lwIP TCP/IP stack experimental support on Windows
+  + OpenSSL: Use SSL_MODE_RELEASE_BUFFERS if available
+  + --delegation was added to set CURLOPT_GSSAPI_DELEGATION
+  + nss: start with no database if the selected database is broken
+  + telnet: allow programatic use on Windows
+  + for a list of bugfixes, see
+    http://curl.haxx.se/changes.html#7_22_0
+- Drop curl-openssl-release-buffers.patch: fixed upstream.
+- Add curl-fix-m4.patch: Use 'x' in configure scripts. Fixes issues
+  when configure is run with -Werror -Wall.
+
 -------------------------------------------------------------------
 Sun Sep 18 00:10:42 UTC 2011 - jengelh@medozas.de
 
diff --git a/curl.spec b/curl.spec
index b647d41..f7c4424 100644
--- a/curl.spec
+++ b/curl.spec
@@ -36,8 +36,8 @@ BuildRequires:  libcares-devel
 BuildRequires:  stunnel
 %endif
 #define cvs_suffix -20090302
-Version:        7.21.7
-Release:        4
+Version:        7.22.0
+Release:        1
 # bug437293
 %ifarch ppc64
 Obsoletes:      curl-64bit
@@ -49,8 +49,9 @@ Summary:        A Tool for Transferring Data from URLs
 Url:            http://curl.haxx.se/
 Source:         curl-%version%{?cvs_suffix}.tar.lzma
 Source2:        baselibs.conf
+# PATCH-FIX-UPSTREAM curl-fix-m4.patch dimstar@opensuse.org -- Fix m4 to work with -Werror -Wall configure scripts. Simply 'use' x. Patch sent upstream.
+Patch0:         curl-fix-m4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Patch:          curl-openssl-release-buffers.patch
 
 %description
 Curl is a client to get documents and files from or send documents to a
@@ -83,7 +84,7 @@ user interaction or any kind of interactivity.
 
 %prep
 %setup -q -n curl-%version%{?cvs_suffix}
-%patch
+%patch0 -p1
 
 %build
 # local hack to make curl-config --libs stop printing libraries it depends on