diff --git a/.gitignore b/.gitignore
index 60decd5..dcdc477 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ php-pecl-http.spec~
 /pecl_http-2.0.4.tgz
 /pecl_http-2.0.5.tgz
 /pecl_http-2.0.6.tgz
+/pecl_http-2.0.7.tgz
diff --git a/php-pecl-http.spec b/php-pecl-http.spec
index 8f5dc34..6a9c15b 100644
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@@ -15,7 +15,7 @@
 %global proj_name pecl_http
 %global pecl_name http
 %global with_zts  0%{?__ztsphp:1}
-%if 0%{?fedora} < 21
+%if "%{php_version}" < "5.6"
 # after json hash iconv propro raphf
 %global ini_name  z-%{pecl_name}.ini
 %else
@@ -24,7 +24,7 @@
 %endif
 
 Name:           php-pecl-http
-Version:        2.0.6
+Version:        2.0.7
 Release:        1%{?dist}
 Summary:        Extended HTTP support
 
@@ -65,8 +65,13 @@ Requires:       php-spl%{?_isa}
 %endif
 Requires:       php-pecl(propro)%{?_isa}
 Requires:       php-pecl(raphf)%{?_isa}
-# Can't install both version of the same extension
+%if "%{php_version}" > "5.6"
+# V1 don't support PHP 5.6 https://bugs.php.net/66879
+Obsoletes:      php-pecl-http1 < 2
+%else
+# Can't install both versions of the same extension
 Conflicts:      php-pecl-http1
+%endif
 
 Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
 Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
@@ -108,6 +113,11 @@ Summary:       Extended HTTP support developer files (header)
 Group:         Development/Libraries
 Requires:      php-pecl-http%{?_isa} = %{version}-%{release}
 Requires:      php-devel%{?_isa} >= 5.3.0
+%if "%{php_version}" > "5.6"
+Obsoletes:     php-pecl-http1-devel < 2
+%else
+Conflicts:     php-pecl-http1-devel
+%endif
 
 %description devel
 These are the files needed to compile programs using HTTP extension.
@@ -236,6 +246,9 @@ fi
 
 
 %changelog
+* Fri Jul 11 2014 Remi Collet <remi@fedoraproject.org> - 2.0.7-1
+- Update to 2.0.7
+
 * Thu Apr 24 2014 Remi Collet <remi@fedoraproject.org> - 2.0.6-1
 - Update to 2.0.6
 
diff --git a/sources b/sources
index dfc90ea..4df8dab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f1f35e79c7b4be2a5230123edc7c760  pecl_http-2.0.6.tgz
+49482e5fc049bea682d65314c65ae8ea  pecl_http-2.0.7.tgz