diff --git a/config/config.cfg.default b/config/config.cfg.default
index a9eb19e..296d69c 100644
--- a/config/config.cfg.default
+++ b/config/config.cfg.default
@@ -2,6 +2,10 @@
 host = localhost
 port = 8001
 debug = False
+ssl = False
+# If you set SSL to True with a cert/key then an adhoc (self-signed) certificate is created
+# ssl_cert = cert.pem 
+# ssl_key = key.pem
 
 [Auth]
 auth_enabled = False
diff --git a/requirements.txt b/requirements.txt
index b53aed9..6cc1729 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,3 +10,4 @@ pycountry
 zmq
 requests
 halo
+pyopenssl
diff --git a/server.py b/server.py
index 37317ef..24abf19 100755
--- a/server.py
+++ b/server.py
@@ -35,6 +35,14 @@ logger.setLevel(logging.ERROR)
 server_host = cfg.get("Server", "host")
 server_port = cfg.getint("Server", "port")
 server_debug = cfg.get("Server", "debug")
+server_ssl = cfg.get("Server", "ssl")
+try:
+    server_ssl_cert = cfg.get("Server", "ssl_cert")
+    server_ssl_key = cfg.get("Server", "ssl_key")
+except:
+    server_ssl_cert = None
+    server_ssl_key = None
+    pass
 auth_host = cfg.get("Auth", "misp_fqdn")
 auth_enabled = cfg.getboolean("Auth", "auth_enabled")
 auth_ssl_verify = cfg.getboolean("Auth", "ssl_verify")
@@ -877,8 +885,17 @@ def getGenericTrendingOvertime():
 
 if __name__ == '__main__':
     try:
+        if bool(server_ssl) is True:
+            if server_ssl_cert and server_ssl_key:
+                server_ssl_context = (server_ssl_cert, server_ssl_key)
+            else:
+                server_ssl_context = 'adhoc' 
+        else:
+            server_ssl_context = None
+
         app.run(host=server_host,
             port=server_port,
+            ssl_context=server_ssl_context,
             debug=server_debug,
             threaded=True)
     except OSError as error: