diff --git a/nghttp2-1.7.0-gcc6.patch b/nghttp2-1.7.0-gcc6.patch
new file mode 100644
index 0000000..7bb898b
--- /dev/null
+++ b/nghttp2-1.7.0-gcc6.patch
@@ -0,0 +1,36 @@
+From 74bbd628eb904b8aa4d6258692d581edfe3865e5 Mon Sep 17 00:00:00 2001
+From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
+Date: Sat, 30 Jan 2016 18:41:27 +0900
+Subject: [PATCH] Fix compile error with gcc-6 which enables C++14 by default
+
+Upstream-commit: 4e44fccdcf1d0fea6a8cd88916040e06fc75d9db
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ src/template.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/template.h b/src/template.h
+index 0346034..b5862d5 100644
+--- a/src/template.h
++++ b/src/template.h
+@@ -38,6 +38,9 @@
+ 
+ namespace nghttp2 {
+ 
++#if __cplusplus > 201103L
++using std::make_unique;
++#else  // __cplusplus <= 201103L
+ template <typename T, typename... U>
+ typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
+ make_unique(U &&... u) {
+@@ -49,6 +52,7 @@ typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
+ make_unique(size_t size) {
+   return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
+ }
++#endif // __cplusplus <= 201103L
+ 
+ // std::forward is constexpr since C++14
+ template <typename... T>
+-- 
+2.5.0
+
diff --git a/nghttp2.spec b/nghttp2.spec
index d4c898d..6c44124 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -1,12 +1,15 @@
 Summary: Experimental HTTP/2 client, server and proxy
 Name: nghttp2
 Version: 1.7.0
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: Applications/Internet
 URL: https://nghttp2.org/
 Source0: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz
 
+# make the package compile with gcc-6
+Patch1: nghttp2-1.7.0-gcc6.patch
+
 BuildRequires: CUnit-devel
 BuildRequires: libev-devel
 BuildRequires: openssl-devel
@@ -40,6 +43,7 @@ for building applications with libnghttp2.
 
 %prep
 %setup -q
+%patch1 -p1
 
 
 %build
@@ -101,6 +105,9 @@ make %{?_smp_mflags} check
 
 
 %changelog
+* Fri Feb 05 2016 Kamil Dudka <kdudka@redhat.com> 1.7.0-3
+- make the package compile with gcc-6
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild