diff --git a/Makefile.in b/Makefile.in
index 8e9334681..d5ba70a47 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -238,13 +238,13 @@ install: all
 pem:	src/ssl.cnf
 	@echo "Generating certificate request .. "
 	$(OPENSSLPATH) req -new \
-              -config src/ssl.cnf -out server.req.pem \
+              -config src/ssl.cnf -sha256 -out server.req.pem \
               -keyout server.key.pem -nodes
 	@echo "Generating self-signed certificate .. "
-	$(OPENSSLPATH) req -x509 -days 365 -in server.req.pem \
+	$(OPENSSLPATH) req -x509 -days 3650 -sha256 -in server.req.pem \
                -key server.key.pem -out server.cert.pem
 	@echo "Generating fingerprint .."
-	$(OPENSSLPATH) x509 -subject -dates -fingerprint -noout \
+	$(OPENSSLPATH) x509 -subject -dates -sha256 -fingerprint -noout \
 		-in server.cert.pem
 	@echo "Setting o-rwx & g-rwx for files... "
 	chmod o-rwx server.req.pem server.key.pem server.cert.pem
diff --git a/src/ssl.cnf b/src/ssl.cnf
index 187a96b1c..62352b407 100644
--- a/src/ssl.cnf
+++ b/src/ssl.cnf
@@ -3,7 +3,7 @@
 RANDFILE = ssl.rnd
 
 [ req ]
-default_bits = 1024
+default_bits = 4096
 encrypt_key = yes
 distinguished_name = req_dn
 x509_extensions = cert_type