diff --git a/swig.spec b/swig.spec
index 72ef301..c0c4b95 100644
--- a/swig.spec
+++ b/swig.spec
@@ -4,6 +4,13 @@
 %{!?tcl:%global tcl 1}
 %{!?guile:%global guile 1}
 %{!?lualang:%global lualang 1}
+
+# Ruby segfaults in some tests on fc23 and only on armv7-arch.
+%ifarch %{arm}
+%if 0%{?fedora} = 23
+%{!?rubylang:%global rubylang 0}
+%endif # 0%%{?fedora} = 23
+%endif #arch %%{arm}
 %{!?rubylang:%global rubylang 1}
 
 %ifarch aarch64 %{arm} ppc64le ppc %{power64} s390 s390x
@@ -32,14 +39,16 @@
 Summary: Connects C/C++/Objective C to some high-level programming languages
 Name:    swig
 Version: 3.0.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv3+ and BSD
 URL:     http://swig.sourceforge.net/
 Source0: http://downloads.sourceforge.net/project/swig/swig/swig-%{version}/swig-%{version}.tar.gz
 # Define the part of man page sections
 Source1: description.h2m
 Patch1:  swig207-setools.patch
-# Fix the failure on arch x390 during testing
+# Fix the failure on arch x390 during testing.
+# This patch can be removed in v3.0.6.  Accepted by upstream.
+# https://github.com/swig/swig/pull/334
 Patch2:  swig-2.0.10-Fix-x390-build.patch
 # Fix segfaults of Python-wrappers when generating code with
 # `-buildin -modern -modernargs`.  Patch is upstreamed, see patch-url.
@@ -197,6 +206,12 @@ ln -fs ../../bin/ccache-swig %{buildroot}%{_libdir}/ccache/swig
 %doc Doc Examples LICENSE LICENSE-GPL LICENSE-UNIVERSITIES COPYRIGHT
 
 %changelog
+* Sat Apr 04 2015 Björn Esser <bjoern.esser@gmail.com> - 3.0.5-5
+- Disable Ruby-testsuite on fc23 when building on armv7.  It currently
+  segfaults for unknown reason.
+- Add a notice about Patch2 got accepted by upstream and can be dropped
+  on next version.
+
 * Fri Apr 03 2015 Björn Esser <bjoern.esser@gmail.com> - 3.0.5-4
 - Add Patch3 to fix segfaults of Python-wrappers when generating
   code with `-buildin -modern -modernargs`-flags