diff --git a/fish.changes b/fish.changes
index d78cce2..cd89e8d 100644
--- a/fish.changes
+++ b/fish.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  5 09:31:48 UTC 2015 - schwab@suse.de
+
+- no-return-in-nonvoid-function.patch: fix no-return-in-nonvoid-function
+  error
+
 -------------------------------------------------------------------
 Wed Jan 28 17:26:37 UTC 2015 - zawertun@gmail.com
 
diff --git a/fish.spec b/fish.spec
index bba3341..591d145 100644
--- a/fish.spec
+++ b/fish.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fish
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@ Url:            http://fishshell.com/
 Source:         http://fishshell.com/files/%{version}/fish-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM check_for_command-not-found_command_on_suse.patch gh#fish-shell/fish-shell#1208
 Patch0:         check_for_command-not-found_command_on_suse.patch
+# PATCH-FIX-UPSTREAM no-return-in-nonvoid-function.patch Fix no-return-in-nonvoid-function error
+Patch1:         no-return-in-nonvoid-function.patch
 BuildRequires:  autoconf
 BuildRequires:  doxygen
 BuildRequires:  gcc-c++
@@ -44,6 +46,7 @@ discoverability. The language syntax is simple but incompatible with other shell
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 autoconf
diff --git a/no-return-in-nonvoid-function.patch b/no-return-in-nonvoid-function.patch
new file mode 100644
index 0000000..cb50fa3
--- /dev/null
+++ b/no-return-in-nonvoid-function.patch
@@ -0,0 +1,12 @@
+Index: fish-2.1.1/fallback.cpp
+===================================================================
+--- fish-2.1.1.orig/fallback.cpp
++++ fish-2.1.1/fallback.cpp
+@@ -61,6 +61,7 @@ int tputs(const char *str, int affcnt, i
+     {
+         fish_putc(*str++);
+     }
++    return 0;
+ }
+ 
+ #endif