diff --git a/.gitignore b/.gitignore
index 4891c1f..45528fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/calligra-2.9.4.tar.xz
+/calligra-2.9.5.tar.xz
diff --git a/calligra.spec b/calligra.spec
index 6047d1b..3facf5d 100644
--- a/calligra.spec
+++ b/calligra.spec
@@ -28,8 +28,8 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
 Name:    calligra 
-Version: 2.9.4
-Release: 5%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 Summary: An integrated office suite
 
 License: GPLv2+ and LGPLv2+
@@ -45,6 +45,11 @@ Source0: http://download.kde.org/%{stable}/calligra-%{version}/calligra-%{versio
 # support disabling products we don't package yet
 # fedora lacks mpxj runtime dep for plan import filter, omit until available
 Patch2: calligra-2.9.0-disable_products.patch
+%if 0%{?fedora} > 22
+%global libwps libwps-0.4
+%else
+%global libwps libwps-0.3
+%endif
 Patch3: 0001-adapt-to-libwps-0.4.patch
 
 ## upstream patches
@@ -89,7 +94,7 @@ BuildRequires: pkgconfig(libodfgen-0.1)
 BuildRequires: pkgconfig(librevenge-0.0)
 BuildRequires: pkgconfig(libwpd-0.10)
 BuildRequires: pkgconfig(libwpg-0.3)
-BuildRequires: pkgconfig(libwps-0.4)
+BuildRequires: pkgconfig(%{libwps})
 %endif
 BuildRequires: pkgconfig(OpenColorIO)
 BuildRequires: pkgconfig(poppler-qt4)
@@ -504,7 +509,9 @@ Requires: %{name}-core = %{version}-%{release}
 %setup -q
 
 %patch2 -p1 -b .disable_products
+%if "%{?libwps}" == "libwps-0.4"
 %patch3 -p1 -b .libwps-0.4
+%endif
 
 ## kdchart munging begin
 pushd 3rdparty/kdchart
@@ -1303,6 +1310,9 @@ fi
 
 
 %changelog
+* Tue Jun 09 2015 Rex Dieter <rdieter@fedoraproject.org> 2.9.5-1
+- 2.9.5 (#1228439), libwps-0.4 support f23+ only
+
 * Sat Jun 06 2015 David Tardon <dtardon@redhat.com> - 2.9.4-5
 - enable Apple Keynote import
 - adapt to libwps 0.4
diff --git a/sources b/sources
index 874d23b..bb3dda0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12bf6bd00de3d7b589c1b1cfebca8f91  calligra-2.9.4.tar.xz
+9469c373206ec0d98d80efe8d722930d  calligra-2.9.5.tar.xz