diff --git a/openssl-1.0.1e-truststore.diff b/openssl-1.0.1e-truststore.diff
deleted file mode 100644
index 24c828a..0000000
--- a/openssl-1.0.1e-truststore.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Don't use the legacy /etc/ssl/certs directory anymore but rather the
-p11-kit generated /var/lib/ca-certificates/openssl one (fate#314991)
-Index: openssl-1.0.2a/crypto/cryptlib.h
-===================================================================
---- openssl-1.0.2a.orig/crypto/cryptlib.h	2015-04-03 22:09:06.993805968 +0200
-+++ openssl-1.0.2a/crypto/cryptlib.h	2015-04-03 22:10:12.867717257 +0200
-@@ -81,7 +81,7 @@ extern "C" {
- 
- # ifndef OPENSSL_SYS_VMS
- #  define X509_CERT_AREA          OPENSSLDIR
--#  define X509_CERT_DIR           OPENSSLDIR "/certs"
-+#  define X509_CERT_DIR	          "/var/lib/ca-certificates/openssl"
- #  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
- #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
- # else
diff --git a/openssl-truststore.patch b/openssl-truststore.patch
new file mode 100644
index 0000000..1ec2fe3
--- /dev/null
+++ b/openssl-truststore.patch
@@ -0,0 +1,17 @@
+Don't use the legacy /etc/ssl/certs directory anymore but rather the
+p11-kit generated /var/lib/ca-certificates/openssl one (fate#314991)
+Index: openssl-1.0.2j/crypto/cryptlib.h
+===================================================================
+--- openssl-1.0.2j.orig/crypto/cryptlib.h	2017-02-01 16:50:51.103706760 +0100
++++ openssl-1.0.2j/crypto/cryptlib.h	2017-02-01 16:52:10.517058963 +0100
+@@ -81,8 +81,8 @@ extern "C" {
+ 
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+-#  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_DIR           "/var/lib/ca-certificates/openssl"
++#  define X509_CERT_FILE          "/var/lib/ca-certificates/ca-bundle.pem"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ # else
+ #  define X509_CERT_AREA          "SSLROOT:[000000]"
diff --git a/openssl.changes b/openssl.changes
index b39f0ff..9c4709f 100644
--- a/openssl.changes
+++ b/openssl.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  2 15:19:15 UTC 2017 - vcizek@suse.com
+
+- fix X509_CERT_FILE path (bsc#1022271) and rename
+  updated openssl-1.0.1e-truststore.diff to openssl-truststore.patch
+
 -------------------------------------------------------------------
 Fri Jan 27 10:21:42 UTC 2017 - meissner@suse.com
 
diff --git a/openssl.spec b/openssl.spec
index cfff21d..054833e 100644
--- a/openssl.spec
+++ b/openssl.spec
@@ -54,7 +54,7 @@ Patch3:         openssl-ocloexec.patch
 Patch4:         openssl-1.0.2a-padlock64.patch
 # PATCH-FIX-UPSTREAM http://rt.openssl.org/Ticket/Attachment/WithHeaders/20049
 Patch5:         openssl-fix-pod-syntax.diff
-Patch6:         openssl-1.0.1e-truststore.diff
+Patch6:         openssl-truststore.patch
 Patch7:         compression_methods_switch.patch
 Patch8:         0005-libssl-Hide-library-private-symbols.patch
 Patch9:         openssl-1.0.2a-default-paths.patch