diff --git a/.gitignore b/.gitignore
index a3105a9..2ea5137 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ gridsite-1.5.18.src.tar.gz
 /gridsite-core_R_2_2_0.tar.gz
 /gridsite-core_R_2_2_1.tar.gz
 /gridsite-core_R_2_2_5.tar.gz
+/gridsite-core_R_2_2_6.tar.gz
diff --git a/curl-opts.patch b/curl-opts.patch
deleted file mode 100644
index 6c0eef6..0000000
--- a/curl-opts.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-commit 2124d471f9fc1eed4bf5893ed2701350357c01af
-Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Mon Jul 21 11:10:42 2014 +0200
-
-    Remove ancient curl compatibility stuff. This fixes build with curl 7.37.1 on Fedora 22/rawhide.
-
-diff --git a/src/htcp.c b/src/htcp.c
-index 6d60720..3e1f5a4 100644
---- a/src/htcp.c
-+++ b/src/htcp.c
-@@ -59,20 +59,6 @@
- 
- #include "gridsite.h"
- 
--/* deal with older versions of libcurl and curl.h */
--
--#ifndef CURLOPT_WRITEDATA
--#define CURLOPT_WRITEDATA CURLOPT_FILE
--#endif
-- 
--#ifndef CURLOPT_READDATA
--#define CURLOPT_READDATA CURLOPT_FILE
--#endif
--
--#ifndef CURLE_HTTP_RETURNED_ERROR
--#define CURLE_HTTP_RETURNED_ERROR CURLE_HTTP_NOT_FOUND
--#endif
-- 
- #define HTCP_GET	1
- #define HTCP_PUT	2
- #define HTCP_DELETE	3
diff --git a/gridsite.spec b/gridsite.spec
index 2494a9b..1e75ddc 100644
--- a/gridsite.spec
+++ b/gridsite.spec
@@ -1,10 +1,10 @@
 %define aprversion 1
-%define underversion 2_2_5
+%define underversion 2_2_6
 %{!?_httpd_mmn: %{expand: %%global _httpd_mmn %%(cat %{_includedir}/httpd/.mmn || echo 0-0)}}
 
 Name:           gridsite
-Version:        2.2.5
-Release:        4%{?dist}
+Version:        2.2.6
+Release:        1%{?dist}
 Summary:        Grid Security for the Web, Web platforms for Grids
 
 Group:          System Environment/Daemons
@@ -21,8 +21,6 @@ Source2:        gridsitehead.txt
 Source3:        gridsitefoot.txt
 Source4:        root-level.gacl
 Source5:        gridsitelogo.png
-# https://github.com/CESNET/gridsite/commit/2124d471f9fc1eed4bf5893ed2701350357c01af
-Patch0:         curl-opts.patch
 
 %if %{?fedora}%{!?fedora:0} >= 10 || %{?rhel}%{!?rhel:0} >= 6
 BuildRequires:  libcurl-devel
@@ -126,8 +124,6 @@ cp -p %{SOURCE3} .
 cp -p %{SOURCE4} .
 cp -p %{SOURCE5} .
 
-%patch0 -p1
-
 
 %build
 (cd src && make prefix=%{_usr} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}" HTTPD_FLAGS="-I%{_includedir}/httpd -I%{_includedir}/apr-%{aprversion}")
@@ -261,6 +257,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/grid-security/vomsdir
 
 
 %changelog
+* Sat Jun 27 2015 František Dvořák <valtri@civ.zcu.cz> - 2.2.6-1
+- Upstream to 2.2.6
+- Removed curl patch merged upstream
+
 * Tue Jun 16 2015 František Dvořák <valtri@civ.zcu.cz> - 2.2.5-4
 - Rebuild for new gsoap
 
diff --git a/sources b/sources
index 9e13f0e..7f91a4c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d92595269c1618b9357d0b1cb114e215  gridsite-core_R_2_2_5.tar.gz
+bc2a4aad0e2c0e5709abd057a278a58d  gridsite-core_R_2_2_6.tar.gz