diff --git a/libgamestream/CMakeLists.txt b/libgamestream/CMakeLists.txt
index 3b026de..d8dd04e 100644
--- a/libgamestream/CMakeLists.txt
+++ b/libgamestream/CMakeLists.txt
@@ -3,7 +3,7 @@ set(SO_VERSION 4)
 find_package(LibUUID REQUIRED)
 find_package(Threads REQUIRED)
 find_package(CURL REQUIRED)
-find_package(OpenSSL 1.0.2 REQUIRED)
+find_package(OpenSSL 1.1.0 REQUIRED)
 find_package(EXPAT REQUIRED)
 
 pkg_check_modules(AVAHI REQUIRED avahi-client)
diff --git a/libgamestream/mkcert.c b/libgamestream/mkcert.c
index 64fede0..b0d2819 100644
--- a/libgamestream/mkcert.c
+++ b/libgamestream/mkcert.c
@@ -22,10 +22,7 @@
 #include <openssl/pem.h>
 #include <openssl/conf.h>
 #include <openssl/pkcs12.h>
-
-#ifndef OPENSSL_NO_ENGINE
-#include <openssl/engine.h>
-#endif
+#include <openssl/rsa.h>
 
 static const int NUM_BITS = 2048;
 static const int SERIAL = 0;
@@ -41,18 +38,10 @@ CERT_KEY_PAIR mkcert_generate() {
 
     bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-    OpenSSL_add_all_algorithms();
-    ERR_load_crypto_strings();
-
     mkcert(&x509, &pkey, NUM_BITS, SERIAL, NUM_YEARS);
 
     p12 = PKCS12_create("limelight", "GameStream", pkey, x509, NULL, 0, 0, 0, 0, 0);
 
-#ifndef OPENSSL_NO_ENGINE
-    ENGINE_cleanup();
-#endif
-    CRYPTO_cleanup_all_ex_data();
-
     BIO_free(bio_err);
 
     return (CERT_KEY_PAIR) {x509, pkey, p12};