diff --git a/mariadb-ownsetup.patch b/mariadb-ownsetup.patch
index c660901..7728cf1 100644
--- a/mariadb-ownsetup.patch
+++ b/mariadb-ownsetup.patch
@@ -1,13 +1,14 @@
---- mariadb-10.3.23/support-files/CMakeLists.txt	2020-06-07 22:02:16.564626222 +0200
-+++ mariadb-10.3.23/support-files/CMakeLists.txt_patched	2020-06-07 22:01:17.180909018 +0200
-@@ -91,6 +91,7 @@ IF(UNIX)
-   ENDIF()
- 
-   CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
-+  CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_BINARY_DIR}/rpm/server.cnf @ONLY)
-   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development)
- 
-   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
+--- mariadb-10.4.14/support-files/CMakeLists.txt	2020-08-06 17:28:28.000000000 +0200
++++ mariadb-10.4.14/support-files/CMakeLists.txt_patched	2020-09-03 13:21:07.826658279 +0200
+@@ -187,6 +187,7 @@ IF(UNIX)
+               COMPONENT SharedLibraries)
+       INSTALL(FILES rpm/mysql-clients.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
+               COMPONENT Client)
++      CONFIGURE_FILE(rpm/server.cnf ${CMAKE_CURRENT_SOURCE_DIR}/rpm/server.cnf @ONLY)
+       INSTALL(FILES rpm/server.cnf DESTINATION ${INSTALL_SYSCONF2DIR}
+               COMPONENT IniFiles)
+       INSTALL(FILES rpm/enable_encryption.preset DESTINATION ${INSTALL_SYSCONF2DIR}
+
 diff -up mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup mariadb-10.0.15/support-files/rpm/server.cnf
 --- mariadb-10.0.15/support-files/rpm/server.cnf.ownsetup	2015-01-24 23:55:55.110063592 +0100
 +++ mariadb-10.0.15/support-files/rpm/server.cnf	2015-01-24 23:57:42.308114387 +0100
diff --git a/mariadb.spec b/mariadb.spec
index d24b56d..03796d7 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -152,7 +152,7 @@
 
 Name:             mariadb
 Version:          10.4.14
-Release:          1%{?with_debug:.debug}%{?dist}
+Release:          2%{?with_debug:.debug}%{?dist}
 Epoch:            3
 
 Summary:          A very fast and robust SQL database server
@@ -1578,6 +1578,9 @@ fi
 %endif
 
 %changelog
+* Thu Sep 03 2020 Michal Schorm <mschorm@redhat.com> - 10.4.14-2
+- Resolves: #1873999, #1874446
+
 * Thu Aug 20 2020 Michal Schorm <mschorm@redhat.com> - 10.4.14-1
 - Rebase to 10.4.14