diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84181ae3..21671a4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,7 +72,7 @@ INCLUDE(FindCURL)
 
 IF(WITH_SIGNCODE)
   IF(WIN32 AND NOT SIGN_OPTIONS)
-    SET(SIGN_OPTIONS /a /t http://timestamp.verisign.com/scripts/timstamp.dll)
+    SET(SIGN_OPTIONS /tr http://timestamp.digicert.com /td sha256 /fd sha256 /a)
   ELSE()
     SEPARATE_ARGUMENTS(SIGN_OPTIONS)
   ENDIF()
diff --git a/libmariadb/mariadb_rpl.c b/libmariadb/mariadb_rpl.c
index d06d583a..ec9ea115 100644
--- a/libmariadb/mariadb_rpl.c
+++ b/libmariadb/mariadb_rpl.c
@@ -455,8 +455,8 @@ void STDCALL mariadb_rpl_close(MARIADB_RPL *rpl)
 }
 
 int mariadb_rpl_optionsv(MARIADB_RPL *rpl,
-                        enum mariadb_rpl_option option,
-                        ...)
+                         enum mariadb_rpl_option option,
+                         ...)
 {
   va_list ap;
   int rc= 0;
@@ -510,8 +510,8 @@ end:
 }
 
 int mariadb_rpl_get_optionsv(MARIADB_RPL *rpl,
-                        enum mariadb_rpl_option option,
-                        ...)
+                             enum mariadb_rpl_option option,
+                             ...)
 {
   va_list ap;