diff --git a/lib/Server.js b/lib/Server.js
index 548bafdc52..188ba7ef67 100644
--- a/lib/Server.js
+++ b/lib/Server.js
@@ -337,10 +337,10 @@ function Server(compiler, options) {
 			};
 		}
 
-		// using built-in self-signed certificate if no certificate was configured
-		options.https.key = options.https.key || fs.readFileSync(path.join(__dirname, "../ssl/server.key"));
-		options.https.cert = options.https.cert || fs.readFileSync(path.join(__dirname, "../ssl/server.crt"));
-		options.https.ca = options.https.ca || fs.readFileSync(path.join(__dirname, "../ssl/ca.pem"));
+		// Use built-in self-signed certificate if no certificate was configured
+		var fakeCert = fs.readFileSync(path.join(__dirname, "../ssl/server.pem"));
+		options.https.key = options.https.key || fakeCert;
+		options.https.cert = options.https.cert || fakeCert;
 
 		if(!options.https.spdy) {
 			options.https.spdy = {
diff --git a/ssl/ca.key b/ssl/ca.key
deleted file mode 100644
index fc6983deab..0000000000
--- a/ssl/ca.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEArclPZ/aEoIjMcu5tarJ0thT/2MA+nqGgljhEYvFWsP8amcFq
-ZmdmyERL8A0cZFAlNWafQl7WBd6zRTeV5fcq6GcBoHU/rlX0TK6urwp4vIYQHD73
-4C2S8k5rfwLGEP9RnNWf1u9mCP8hh6Nn22KDNl8++V2ZkHUve2tBNEcU86DUxBlw
-rm4ITUQbBHy/5g2Qli8GKkFhembW+uj//iNTFILOyPgJOPYSw5nzBLARfOpBT5WB
-xhkasUh3A6mZ3ZG3SwwlMSb1l9ytYsQJMpwETVMPmeBp5ElMNh+ExrXtdGWeL/+V
-I5pLQqcArgr1wBRi/IVKiRo5rmtFT6I/Znk68QIDAQABAoIBAQCcYhDgfscuJqvD
-qKYxY1D/ILpx89zlpo/5Xby8RGw8bfMj9Ran+9hT0pF6/HFWG4DAIw6hDPIO6i3r
-1W9AN0EXTMn7+EZLvPFPp8ltnkCzdPg+UrN/ucMH5GV7L6XIWdi5BssFAPySj/M+
-OV8V3foxDVh/0SiFA86sgwFz55sE93NHziGzgjK5jKkP5Hq7dE8HUSjQbpWndaXf
-naVu2KzBIMn9EKlZFXV76dhgkxhFQryn2hid96l6LG1x8djYPtfbxZY1MoQBNqEl
-NselXZT/udeSYJN5waIlcCO4r29Xfh94y1s7zkK2gsHMRqVulOe/0whGcbGNDWSF
-2KPm24QhAoGBANw8rIs9RTWZKdqrNxWlpIjDOlstmLIDVgybNxJoGxvTxqHgGhlw
-H700z7YCU5R4xEFif0iJ3x1d5G+c6x1Y/IRhypDRm0TUQJH3qe6A+xHR5nM6jQ7e
-A7v4K30siNkrOImWpQdzLg4UlY50IF0TgDXgSLqs/0D6PJiMVTHJAtwlAoGBAMoB
-quUjxTl6y/TQkhRX6ElCpWuB6ODSJjhXMF+yiLDTKgVzlykwi+KoL+jWYbGZq6o5
-wKC0X2SjyNfx7wOh2blLP/2r2MeShSsSg2bpIn7M3U/toNLmt6AQc2L1COJ94rVC
-ouqEvPxvvVF7kynPnffEJdCym0VjCcdyAiFivcPdAoGABiqgvilSBcUrGddPbIi9
-yaKFwMXPD7TuNN4ntZk6oRXV6vRmZq3wBZEz+6mnA3I6NIZ4f+R0XdMiMUnYf3Ld
-ZyuBy3pC+bNjt3KSzH3KCd6xsCpEhtUKj7nMJe4YStRd+eRA7Kt576T95wYzXcfN
-ADUudCOh5gTbq33KaOFy9g0CgYEAhd/vCybWqU5ZZujnNvY/anXxvTr+RCjhzYry
-8ykV7+IyQiSl9FVJD7CY971ER3hpTUozAA4p/j+RdpPO7GBSM7vML+i4pSLUgIQn
-c4dkJhbNQRBh+gOPhFQCtH1iIwB8w9XitHu956qCFENKd3Yx4acrzJDh2G1XaMeE
-4+1ViD0CgYEAxC7j81KQylsge5+hEPs1BxOBH8c+q18EXbpafHlTiHfy2omEkpRA
-mUC/7/BarrprQp01MU3hOl0LMAD24cEsa9YQvGOpWTKXO8K8EIP2DDeGsjvOfPKi
-Ks5OcLjl17uJsP1jIjkNDJeTU4lpRrErZND2Uv6GDNkZx3o4YSMbXVk=
------END RSA PRIVATE KEY-----
diff --git a/ssl/ca.pem b/ssl/ca.pem
deleted file mode 100644
index f2b51ddc12..0000000000
--- a/ssl/ca.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDvjCCAqagAwIBAgIJAOeTbxr0pkMkMA0GCSqGSIb3DQEBCwUAMEgxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMRAwDgYDVQQKEwd3ZWJwYWNrMRIw
-EAYDVQQDEwlsb2NhbGhvc3QwHhcNMTYwODI3MTUzMTE5WhcNMTkwNjE3MTUzMTE5
-WjBIMQswCQYDVQQGEwJVUzETMBEGA1UECBMKU29tZS1TdGF0ZTEQMA4GA1UEChMH
-d2VicGFjazESMBAGA1UEAxMJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEArclPZ/aEoIjMcu5tarJ0thT/2MA+nqGgljhEYvFWsP8amcFq
-ZmdmyERL8A0cZFAlNWafQl7WBd6zRTeV5fcq6GcBoHU/rlX0TK6urwp4vIYQHD73
-4C2S8k5rfwLGEP9RnNWf1u9mCP8hh6Nn22KDNl8++V2ZkHUve2tBNEcU86DUxBlw
-rm4ITUQbBHy/5g2Qli8GKkFhembW+uj//iNTFILOyPgJOPYSw5nzBLARfOpBT5WB
-xhkasUh3A6mZ3ZG3SwwlMSb1l9ytYsQJMpwETVMPmeBp5ElMNh+ExrXtdGWeL/+V
-I5pLQqcArgr1wBRi/IVKiRo5rmtFT6I/Znk68QIDAQABo4GqMIGnMB0GA1UdDgQW
-BBTA4dwZxOrferD2ROAZQxNjPx8FZzB4BgNVHSMEcTBvgBTA4dwZxOrferD2ROAZ
-QxNjPx8FZ6FMpEowSDELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUx
-EDAOBgNVBAoTB3dlYnBhY2sxEjAQBgNVBAMTCWxvY2FsaG9zdIIJAOeTbxr0pkMk
-MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBACdhina1N8ym01X/wsjs
-nKBSwKKDpUcNtmjxO3vfjwSoKwmgFvSViYePJMGE3vZA9p+hlsJF+H+4ArxPALZm
-3sL2zfZQjqKBVOW04uljTEb21rbvNKaGB8f5ca7m2KZn85/TClGoNeAJaxrI/F9g
-jwMU9BnV2Fncg53HZH7Jc+hVEOTKTHjAKO8yP41nWASBWFuq6+Gt6/KNG0bWHOsJ
-xnhQ+AqoId6kvFksQ9ADCk7MQp03jEGiH7cZUfm68Z1G13jLC+Z/phgHMoVvSqhB
-JfzXuhivwMAeiTM3lav4hC3o0YJuC7bGEqzXLhdxW0xR/2YSCrJCuSzPutNUXeHQ
-Zf4=
------END CERTIFICATE-----
diff --git a/ssl/server.crt b/ssl/server.crt
deleted file mode 100644
index bfacd7ff20..0000000000
--- a/ssl/server.crt
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDDDCCAfQCCQCNymMB1zucZjANBgkqhkiG9w0BAQsFADBIMQswCQYDVQQGEwJV
-UzETMBEGA1UECBMKU29tZS1TdGF0ZTEQMA4GA1UEChMHd2VicGFjazESMBAGA1UE
-AxMJbG9jYWxob3N0MB4XDTE2MDgyNzE1MzE0N1oXDTE4MDEwOTE1MzE0N1owSDEL
-MAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUxEDAOBgNVBAoTB3dlYnBh
-Y2sxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBANlHguG1IVl6xZJCRX3ELtjpgLc4dpp0S3BK9ynZP0YvFYcPVPiEA1kN
-xvFkN+MKn9JJvzlZXlI35EZoRjREFI/PavmclnBItMY9K8T9oEuQmvFKIxacOi66
-qk1zUJtwRB9IhzZm2CBkmhcigRgiibWAAx/GdpaXhLWoOPwMD6QG1QPJrfnmwe7y
-90tpwcs4dsea77uyL35UUxM7DaMiq5uVShVd46NEX9VH6zY3ab4fTxkwPJ66cJHC
-LR9kaELQbkgArSAZlT86oG5iKegzqbdhYy4vyM9yRjNqYomWvlw8qWbqJyxmL5BE
-LTIDW5XX6Dh4jme+kDzSTwkkjFX59hUCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-n4NbybUH5fFqBYxy8Jetd1jTtrJFZhHUKmNwxIjDwX5NXxhbB8MbHTSvd1KjNZUE
-2ZYDQ15likcBIF0BBIWyuWEjRFhqdLsemKCzz6IYnGCiLHB79UfEh/FBnqAgcXgR
-TS2OlKi9V3Wq64uMY00SfWWmIsD0U51rjnkGLBc6I8hh/eGfqqTSOaEHhBQyaPD6
-wIL5fK5xONMh5PgQVzUmqAmkeq0VPrDE5+TDPo96INnHZYfEXA9YeOtMHwTGG3B2
-HXT/UDkbiceTTu0S4N8woI8fs/S7Y2AAdguWEXTCt1yUWVhzL0oU6upVoJCLrYQ2
-2JqxiBi4eGNUfedAnnrOvQ==
------END CERTIFICATE-----
diff --git a/ssl/server.csr b/ssl/server.csr
deleted file mode 100644
index dec9c34b57..0000000000
--- a/ssl/server.csr
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN CERTIFICATE REQUEST-----
-MIICjTCCAXUCAQAwSDELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUx
-EDAOBgNVBAoTB3dlYnBhY2sxEjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZI
-hvcNAQEBBQADggEPADCCAQoCggEBANlHguG1IVl6xZJCRX3ELtjpgLc4dpp0S3BK
-9ynZP0YvFYcPVPiEA1kNxvFkN+MKn9JJvzlZXlI35EZoRjREFI/PavmclnBItMY9
-K8T9oEuQmvFKIxacOi66qk1zUJtwRB9IhzZm2CBkmhcigRgiibWAAx/GdpaXhLWo
-OPwMD6QG1QPJrfnmwe7y90tpwcs4dsea77uyL35UUxM7DaMiq5uVShVd46NEX9VH
-6zY3ab4fTxkwPJ66cJHCLR9kaELQbkgArSAZlT86oG5iKegzqbdhYy4vyM9yRjNq
-YomWvlw8qWbqJyxmL5BELTIDW5XX6Dh4jme+kDzSTwkkjFX59hUCAwEAAaAAMA0G
-CSqGSIb3DQEBBQUAA4IBAQCTYwkIeFdQZYkYmvjHc8mLWCUKSGWA3YNSeDlLT71O
-eVm5CzxP8o02LL0KXdVp7idHkQLYhM/0ySWMDu/4dH4WybTEBlLsmgtvB65yhFXx
-98c87oTfXffp3YQFWC0O2qHA9pQAxOKQeMMltkfJTVirkVo759F0fdoiRdOZLfl/
-YhWocOR8jnjQwRrrDcDvOUPqx9Y69bYqh1J1KupNEobguzMfu2/oE6gZqWIod3PM
-g340TzNkT62KZgtUL4RSmWa+JP2cRqkMTZn6WhHSQtSdh/w2RrBtcFwpFT4YFcXw
-QvZg4blvTZRgVe6L4/mEjyGvGM6F/h0juGpk2kIahVad
------END CERTIFICATE REQUEST-----
diff --git a/ssl/server.key b/ssl/server.key
deleted file mode 100644
index e74ac0814e..0000000000
--- a/ssl/server.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA2UeC4bUhWXrFkkJFfcQu2OmAtzh2mnRLcEr3Kdk/Ri8Vhw9U
-+IQDWQ3G8WQ34wqf0km/OVleUjfkRmhGNEQUj89q+ZyWcEi0xj0rxP2gS5Ca8Uoj
-Fpw6LrqqTXNQm3BEH0iHNmbYIGSaFyKBGCKJtYADH8Z2lpeEtag4/AwPpAbVA8mt
-+ebB7vL3S2nByzh2x5rvu7IvflRTEzsNoyKrm5VKFV3jo0Rf1UfrNjdpvh9PGTA8
-nrpwkcItH2RoQtBuSACtIBmVPzqgbmIp6DOpt2FjLi/Iz3JGM2piiZa+XDypZuon
-LGYvkEQtMgNbldfoOHiOZ76QPNJPCSSMVfn2FQIDAQABAoIBAGIiilqnFIj1ioak
-p/5FvWL7E8etGORp4ii1syyTkqCAY5i8tAQKm/h84H3mZdeF1OmFpXihhJhd5hxm
-vE6e8SqC5C4ZK1lLfVqMBljStLNsfI6+jVqI9T5l0MVqb93Etv/qIifQC42V4oLQ
-cr4T216+kqqnWKhrhuUFNbehOu850a+tCFPd8LDS1Gvwb5WZBViCzm4/lqcI7d/Q
-btNZ605b8KN/prIYBzSvNAaxOCRCtTHKg/kQ4/6XBpxZNq2DcjL444juT6RNIexm
-XiHPt5gYY7vn9PGhNy9TXUfCwsIX94x0amB7HbDY4wEnCKkAGp4aGICYRb8BTSP7
-p17XM4ECgYEA7S4enmBeJgdHG5gb0oThVNzmJ3D9P9gPRgIPpPTWoenedx5Qd7Ku
-IaxsJDZ9ZGfoLpYEM0bGr4gKW31JwfKTLHnMktBqcXVaGtqdq72wV4ne8X39SsS9
-CUxKk+/of92PckRDjBWmiNXqUmgqBNB9W5JJCDkkQ7U7NJV76RSlBrMCgYEA6oUk
-oFXzZc9JSZVfaLgDUaTkme0KsDcEYsk6OicqAiZxXebcEh38bIt3hBx2x28rAZ13
-ZyIUtqoA1nKA4paWGTSB9Bpkes5VQmGaVbBX7V7pKCwVSYN1gfLu/SM6eASsKdAS
-5aHo52KzWiXsEtOrVMKDL5pkjaSWuLYBGggONBcCgYEAsmDSRFjD1iP5FcbDfgPU
-GGf+bMFspfyQGB3quCwv1Bw45SuWZz+p+MddmaqlicMf+xF2XT4opdFRwNcshsIy
-b+u2sOAwfd49gx7SIF0MZ/nYA5W2zunCJmELYdG38ZqnjM/MYWnTEuyXS5ztpStM
-bHdLl/Sp0oZV3cljJLwTFUMCgYBMrcPP+MpgW2om+QP9BU1wgG2ONobsHtD8S7cS
-FIQTt+YRQc5qzgseomstcvETPDHfkVDdE7OaFfO4KjAh5gKlsxlaata3oIcX8Tm5
-ErNtFT8+t0sugiEFoByr/7y6SSzRbwr+sfWo0gi6TPPnI/Y8/GxQQDboaQwu0LOD
-g2bBeQKBgAMK6U3d64J01ve2McZwowyp3LbWpoIyQ9H2Ulaf2bV5jO7kGo/nzyM9
-SlmYRtNuDT++djmkue5mxLO5khvPm6TrSxRluwUz2iVz4BEDkTT4fOxq2Xq1TrMe
-UYpfzRml/XZtUOzL0fHXGckCNXb4wnC2f5kMIT9QMVhB2Srqgjrz
------END RSA PRIVATE KEY-----
diff --git a/ssl/server.pem b/ssl/server.pem
new file mode 100644
index 0000000000..ee07b83454
--- /dev/null
+++ b/ssl/server.pem
@@ -0,0 +1,46 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA5b5hZ2dxwP0Q05MMVZGZrs+ecc5ZzOBbvkvk1CZ7D/7aXeyd
+/vWRXD66ZQbkwp8XUxchAvLCmy84pCwcxdajXoT/Ydj80X+SPuHdx7YxodSY9rl5
+KfOj5n3n4UPxOJRXFWznOG+aterqYb+WRTmcJfS9+cJtfCz5QNnYHhdzcDePClP8
+d78o/6VMGAxl2sucoF+yx9XAs1vQD6wYiNWh5POdlxXAr1iuztuny/MV0dlnt1/2
+NQtpVj3OveMNqi6LedO3beWMu5Nb3snnUdK68ExoiJVtbJZ5zEolMrY9zS9J3lTV
+kq7whZUAm18ahbUX8g3jfl25XEVUjjKbNB3vfQIDAQABAoIBAANyKpXZeFxTr2ft
+Abda2rpDhPXiCXjIOLgO/VytQxVHVlEoVmpXlpmSm0seolnE9x2Y8DbSG1cmiyvz
+OW9CO+sUBZybG5es2S22R5RSSEZMIQs6VvXpIKE5bDv1v+2AVBoPKxyul9x4rJFQ
+xVk+dvgexqazYt8E8awmWFaDNYkOVQCBcBvbiObg1g7m3iY8vaTnTOixYva++++0
++7XcVwYsF1yD8UE8I311ujhsoi+bK6Skz/lNqy+//59pIae9hRHAo2Mh79zCxapf
+miDbTI9Vs39eL6h52yO1V+fJ352sFJzxlx8xDGEPJeVqS6ht8C067BXAgVGvvaMl
+7jGT44UCgYEA+nAG77B+buP/qGYJMYYZQuUxQQq7nM0D2QA1u233lQMUBaTzDQTq
+jhSfdlko2uguad8HaqmVS2fhHQXFDNsCWTmrA7r3qB2TvWCOct4a+sAosP/CWRo9
+Dk67hKCpPBVMA1HBcj0gmYccd4/Wz8d1DfiUyv63dTWCiVUNOQU1rFsCgYEA6tiw
+X4RqdT9kz0FETENG0y7TV/VHBeqGJLcyzekc1+HX5vUuextaaDBplzxmES6WnQO3
+9geEksD/4pKuAJUNQUjUSYEabWuSIO3ix2irJEmX6UISGJOVKGnmOzrdgOzVZg30
+gqRr0JXm99ci93piQewqXVYWfeqWLSw8u6NL+wcCgYBweQmUciaGNN1nytOMK1aD
+BZ3WQTS7GhQFTCPVlnCfuq8uTcNecHvK7ZYkN6yyi530rFaPX7QOFowyVZoGyQFI
+Ay870KdTGF12qruu+PMS9GQSAftNuwv6tf9fdCwtML9fqkL/xFY0vUpao/3seP6o
+FKD2fej0ueBzPwBeQGm3iwKBgF6PKVUMaCEViW26Bdn/LMFTlV1RMWu8Zo7aBObL
++gUitmAUUMbY2Koi9CEk/KPmclZ+bM/vbv34IBAGp3Esks26mV+PUCjGq2v+3NUV
+2/McfsI5DDhBFEnVehJXPWDv+2zAKbeApLiz4u/f/ABRksagZN54D05b6mP97+ZN
+dgZ5AoGBAIBXSJ24JOo6Z8hiqQVEO9oI1ZQlwzc2TR1dKrjLBl2y7/AClSr3b2++
+iNQOyycweCF8WPM+Pf9fRBjI6STtiboVAcCq/vP/eSGX5SJWRSTENFTiBprdcj2P
+p+exFe+9P1yAy5WxLnt7cTFsdgqG6HXq0MOEUIyNcLVWnmZnIncC
+-----END RSA PRIVATE KEY-----
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIJAL7WpFUUJ1eDMA0GCSqGSIb3DQEBCwUAMBQxEjAQBgNV
+BAMTCWxvY2FsaG9zdDAeFw0xNjEwMjkxNDAzNDJaFw0yNjEwMjcxNDAzNDJaMBQx
+EjAQBgNVBAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAOW+YWdnccD9ENOTDFWRma7PnnHOWczgW75L5NQmew/+2l3snf71kVw+umUG
+5MKfF1MXIQLywpsvOKQsHMXWo16E/2HY/NF/kj7h3ce2MaHUmPa5eSnzo+Z95+FD
+8TiUVxVs5zhvmrXq6mG/lkU5nCX0vfnCbXws+UDZ2B4Xc3A3jwpT/He/KP+lTBgM
+ZdrLnKBfssfVwLNb0A+sGIjVoeTznZcVwK9Yrs7bp8vzFdHZZ7df9jULaVY9zr3j
+Daoui3nTt23ljLuTW97J51HSuvBMaIiVbWyWecxKJTK2Pc0vSd5U1ZKu8IWVAJtf
+GoW1F/IN435duVxFVI4ymzQd730CAwEAAaN1MHMwHQYDVR0OBBYEFKkaLYAmQMa/
+1mDLJBlOn+h116WbMEQGA1UdIwQ9MDuAFKkaLYAmQMa/1mDLJBlOn+h116WboRik
+FjAUMRIwEAYDVQQDEwlsb2NhbGhvc3SCCQC+1qRVFCdXgzAMBgNVHRMEBTADAQH/
+MA0GCSqGSIb3DQEBCwUAA4IBAQCi2ywUN/y5fgH2PTVZjgKq6AUD/RqrdTISa2UO
+kxcSPlSGNlapjHD3iGpZ2FdyCVYoCIIRx9Eol9B2VW7gihbJrMdybbZk1v16AN1y
+sqgcHhXOeEh4Phi/suljZOaCWGoj1eZOvTXV7fZjeSq4lmdXEwFGuxXwVgvt8teM
+vJT6i3DtxcD7+V60Q691ky+QuZqDG1FKVmzXQ1CNt7Bq3075pled1KJz8ziIEdjc
+KeBDWN/NLbyZeBwlg9QxrbGazxGedMQdDzG5kyaaXwhCvAxfY2yHzkV/2iFE17AJ
+0796jb2KsrT6JNtwkMye1Jc/ZwNat7InH5WkqFzUrCKqw08u
+-----END CERTIFICATE-----