diff --git a/Makefile b/Makefile
index 0af502e..83e6db8 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ MACHINE := $(shell gcc -dumpmachine)
 ifeq ($(MACHINE),$(filter x86_64-%,$(MACHINE)))
   MYCPU := x64
   MARCH := x86-64
-  MTUNE := corei7
+  MTUNE := znver3
 else
   MYCPU := x86
   MARCH := i486
@@ -16,7 +16,7 @@ else
 endif
 
 CFLAGS = -march=$(MARCH) -mtune=$(MTUNE) -Os -DNDEBUG -Wall -flto -Ideps/$(MYCPU)/include
-LDFLAGS = -Ldeps/$(MYCPU)/lib -static -Wl,--strip-all
+LDFLAGS = -Ldeps/$(MYCPU)/lib -static -Wl,--strip-all -Wl,--trace
 LIBS = -lcrypto
 
 ifeq ($(MACHINE),$(filter %-mingw32,$(MACHINE)))
diff --git a/deps/build-openssl-linux.sh b/deps/build-openssl-linux.sh
index 85bdb9e..84ee50a 100755
--- a/deps/build-openssl-linux.sh
+++ b/deps/build-openssl-linux.sh
@@ -15,7 +15,7 @@ case "$(cc -dumpmachine)" in
   x86_64-*)
     readonly MY_CPU=x64
     readonly MY_MARCH=x86-64
-    readonly MY_MTUNE=corei7
+    readonly MY_MTUNE=znver3
     ;;
   *)
     echo "Unknown compiler detected!";
@@ -35,7 +35,7 @@ rm -rf "${LIBS_DIR}" && mkdir -p "${LIBS_DIR}/bin" "${LIBS_DIR}/include" "${LIBS
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Fetch sources
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-wget -4 -O "${LIBS_DIR}/openssl.tar.gz" https://www.openssl.org/source/openssl-1.1.1k.tar.gz
+wget -4 -O "${LIBS_DIR}/openssl.tar.gz" https://www.openssl.org/source/openssl-1.1.1p.tar.gz
 tar -xvf "${LIBS_DIR}/openssl.tar.gz" --strip-components=1 -C "${OSSL_DIR}"
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/deps/build-openssl-mingw.sh b/deps/build-openssl-mingw.sh
index bea7e08..20c5665 100755
--- a/deps/build-openssl-mingw.sh
+++ b/deps/build-openssl-mingw.sh
@@ -15,7 +15,7 @@ case "$(cc -dumpmachine)" in
   x86_64-*)
     readonly MY_CPU=x64
     readonly MY_MARCH=x86-64
-    readonly MY_MTUNE=corei7
+    readonly MY_MTUNE=znver3
     ;;
   *)
     echo "Unknown compiler detected!";
@@ -35,7 +35,7 @@ rm -rf "${LIBS_DIR}" && mkdir -p "${LIBS_DIR}/bin" "${LIBS_DIR}/include" "${LIBS
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Fetch sources
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-wget -4 -O "${LIBS_DIR}/openssl.tar.gz" https://www.openssl.org/source/openssl-1.1.1k.tar.gz
+wget -4 -O "${LIBS_DIR}/openssl.tar.gz" https://www.openssl.org/source/openssl-1.1.1p.tar.gz
 tar -xvf "${LIBS_DIR}/openssl.tar.gz" --strip-components=1 -C "${OSSL_DIR}"
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~