diff --git a/0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch b/0003-CFE-2629-Openssl-1.1-compatibility.patch
similarity index 99%
rename from 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch
rename to 0003-CFE-2629-Openssl-1.1-compatibility.patch
index 101eba9..b0f72f4 100644
--- a/0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch
+++ b/0003-CFE-2629-Openssl-1.1-compatibility.patch
@@ -1,9 +1,9 @@
-From 15e035116bf2d3ccba251fc7bc39f5e2e5b7eed7 Mon Sep 17 00:00:00 2001
+From b1d817e5e65a7db77c1a1b039229b894874f041d Mon Sep 17 00:00:00 2001
 From: Dimitrios Apostolou <jimis@northern.tech>
 Date: Wed, 25 Oct 2017 17:03:39 +0200
-Subject: [PATCH 3/3] Merge pull request #2916 from jimis/openssl_1_1
+Subject: [PATCH 3/3] CFE-2629: Openssl 1.1 compatibility
 
-CFE-2629: Openssl 1.1 compatibility
+Merge pull request #2916 from jimis/openssl_1_1
 ---
  cf-agent/cf-agent.c                                |   2 +
  cf-key/cf-key-functions.c                          |   6 +-
@@ -1898,5 +1898,5 @@ index 69579ecbf457..4b98c901c999 100644
  
  #include <sys/socket.h>
 -- 
-2.15.0
+2.15.1
 
diff --git a/cfengine.changes b/cfengine.changes
index d2fcc8d..ade653b 100644
--- a/cfengine.changes
+++ b/cfengine.changes
@@ -1,7 +1,7 @@
 -------------------------------------------------------------------
 Mon Dec  4 11:24:38 UTC 2017 - kkaempf@suse.com
 
-- add 0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch
+- add 0003-CFE-2629-Openssl-1.1-compatibility.patch
   for openssl-1.1.0 compatibility
 
 -------------------------------------------------------------------
diff --git a/cfengine.spec b/cfengine.spec
index ccee02a..b99b008 100644
--- a/cfengine.spec
+++ b/cfengine.spec
@@ -70,10 +70,10 @@ Patch1:         0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
 # PATCH-FEATURE-UPSTREAM better /etc/SuSE-release parsing, upstream #5423
 # kkaempf@suse.de
 Patch2:         0002-Simplify-and-fix-parsing-of-etc-SuSE-release-fixes-i.patch
-# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881
-Patch3:         reproducible.patch
 # PATCH-FIX-UPSTREAM https://github.com/cfengine/core/commit/f4b9c855c0b035c0188fcdf79d2cbddab2f1bdcc
-Patch4:         0003-Merge-pull-request-2916-from-jimis-openssl_1_1.patch
+Patch3:         0003-CFE-2629-Openssl-1.1-compatibility.patch
+# PATCH-FIX-UPSTREAM https://github.com/cfengine/core/pull/2881
+Patch4:         reproducible.patch
 # SLE 11 or RHEL5 autoconf does not support AM_SUBST_NOTMAKE, kkaempf@suse.de
 Patch10:        make_home_dir_for_tests.patch
 Patch99:        remove-am_subst_notmake.patch
@@ -170,10 +170,11 @@ Lots of example promises for CFEngine.
 %setup -q -n %{srcname}
 %patch1 -p1
 %patch2 -p1
+%if 0%{?suse_version} >= 1500
+# openssl 1.1.0
 %patch3 -p1
-%if 0%{?suse_version} == 1550
-%patch4 -p1
 %endif
+%patch4 -p1
 %if 0%{?suse_version} <= 1110
 %patch99 -p1
 %endif