diff --git a/changelog b/changelog
index dd05c5cf..c49bf5d3 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,7 @@
+Tue Sep 10 14:09 2013 CDT
+    * lib/config.js, lib/server.js: Add a config key for the passphrase
+      to the ssl key.
+
 Mon Sep  9 22:10 2013 CDT
     * lib/acp.js: Change acp-channel-unload callback to duplicate the list
       of users in the channel to prevent concurrent modification while
diff --git a/lib/config.js b/lib/config.js
index 82e7d3e0..92a4b78f 100644
--- a/lib/config.js
+++ b/lib/config.js
@@ -22,6 +22,7 @@ var defaults = {
     "io-host"             : "0.0.0.0",
     "enable-ssl"          : false,
     "ssl-keyfile"         : "",
+    "ssl-passphrase"      : "",
     "ssl-certfile"        : "",
     "ssl-port"            : 443,
     "asset-cache-ttl"     : 0,
diff --git a/lib/server.js b/lib/server.js
index fcc98721..3a44f1b1 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -218,6 +218,7 @@ var Server = {
 
             var options = {
                 key: key,
+                passphrase: self.cfg["ssl-passphrase"],
                 cert: cert
             };