diff --git a/0007-strongswan-pkifix.918474.patch b/0007-strongswan-pkifix.918474.patch
deleted file mode 100644
index b85d0f1..0000000
--- a/0007-strongswan-pkifix.918474.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-References: bsc#918474,https://wiki.strongswan.org/issues/881
-Upstream: yes
-
-Index: strongswan-5.1.3/src/pki/command.c
-===================================================================
---- strongswan-5.1.3.orig/src/pki/command.c
-+++ strongswan-5.1.3/src/pki/command.c
-@@ -73,7 +73,7 @@ static void build_opts()
- 	memset(command_optstring, 0, sizeof(command_optstring));
- 	if (active == help_idx)
- 	{
--		for (i = 0; cmds[i].cmd; i++)
-+		for (i = 0; i < MAX_COMMANDS && cmds[i].cmd; i++)
- 		{
- 			command_opts[i].name = cmds[i].cmd;
- 			command_opts[i].val = cmds[i].op;
diff --git a/strongswan.changes b/strongswan.changes
index e96000a..84ad58f 100644
--- a/strongswan.changes
+++ b/strongswan.changes
@@ -1,11 +1,3 @@
--------------------------------------------------------------------
-Mon Mar  9 08:37:42 UTC 2015 - mt@suse.de
-
-- Applied a fix by Marcus Meissner for a loop check in ipsec pki
-  causing a segfault on attempt to create certificates when fips
-  is enabled (bsc#918474,https://wiki.strongswan.org/issues/881)
-  [+ 0006-strongswan-pkifix.918474.patch]
-
 -------------------------------------------------------------------
 Mon Jan  5 14:38:46 UTC 2015 - mt@suse.de
 
diff --git a/strongswan.spec b/strongswan.spec
index d991798..29cf131 100644
--- a/strongswan.spec
+++ b/strongswan.spec
@@ -82,7 +82,6 @@ Patch2:         %{name}_ipsec_service.patch
 Patch3:         %{name}_fipscheck.patch
 Patch4:         %{name}_fipsfilter.patch
 %endif
-Patch7:         0007-strongswan-pkifix.918474.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  bison
 BuildRequires:  curl-devel
@@ -292,7 +291,6 @@ and the load testing plugin for IKEv2 daemon.
 %if %{with fipscheck}
 %patch3 -p0
 %patch4 -p1
-%patch7 -p1
 %endif
 sed -e 's|@libexecdir@|%_libexecdir|g'    \
      < $RPM_SOURCE_DIR/strongswan.init.in \