diff --git a/gcc5-fixes.patch b/gcc5-fixes.patch
new file mode 100644
index 0000000..552b8ba
--- /dev/null
+++ b/gcc5-fixes.patch
@@ -0,0 +1,11 @@
+--- cmake/Modules/DefineCompilerFlags.cmake
++++ cmake/Modules/DefineCompilerFlags.cmake
+@@ -10,7 +10,7 @@
+     if (${CMAKE_C_COMPILER_ID} MATCHES "(GNU|Clang)")
+ 
+         # add -Wconversion ?
+-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
++        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic")
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
+         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
diff --git a/libssh.changes b/libssh.changes
index 98b4634..8829ccc 100644
--- a/libssh.changes
+++ b/libssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed May  6 20:26:52 UTC 2015 - dmueller@suse.com
+
+- add gcc5-fixes.patch: Fix build against GCC 5.x
+
 -------------------------------------------------------------------
 Thu Apr 30 14:08:31 UTC 2015 - asn@cryptomilk.org
 
diff --git a/libssh.spec b/libssh.spec
index d9f8b52..c74a5f9 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -34,6 +34,7 @@ Url:            https://www.libssh.org
 
 Source0:        %{name}-%{version}.tar.xz
 Source99:       baselibs.conf
+Patch0:         gcc5-fixes.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -86,6 +87,7 @@ Documentation for libssh development.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
 if test ! -e "build"; then