diff --git a/install/update.php b/install/update.php
index 3361c3c1918c6bb8803bc67d44473bcbe0488016..616bef6a26ec2b8d278ba25571018702c1a26cbc 100644
--- a/install/update.php
+++ b/install/update.php
@@ -524,6 +524,13 @@ if ($inst->install_ispconfig_interface) {
 	}
 }
 
+// Create SSL certs for non-webserver(s) ?
+if(($conf['apache']['installed'] && $conf['apache']['installed']) == false) {
+    if(strtolower($inst->simple_query('Do you want to create SSL certs for your server?', array('y', 'n'), 'y')) == 'y') {
+        $inst->make_ispconfig_ssl_cert();
+    }
+}
+
 $inst->install_ispconfig();
 
 // Cleanup