diff --git a/VERSION b/VERSION
index b38ebbf..a0cd9f0 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0.4
\ No newline at end of file
+3.1.0
\ No newline at end of file
diff --git a/VERSION_MINOR b/VERSION_MINOR
index f398a20..06a4457 100644
--- a/VERSION_MINOR
+++ b/VERSION_MINOR
@@ -1 +1 @@
-3.0
\ No newline at end of file
+3.1
\ No newline at end of file
diff --git a/overlay/etc/bf/templates/nginx-proxy.conf.esh b/overlay/etc/bf/templates/nginx-proxy.conf.esh
index 1b42d1c..9372824 100644
--- a/overlay/etc/bf/templates/nginx-proxy.conf.esh
+++ b/overlay/etc/bf/templates/nginx-proxy.conf.esh
@@ -45,6 +45,9 @@ server {
     # include secure headers
     include                         helpers/proxy-secure-headers.conf;
 
+    # include custom configuration
+    include                         <%= "${CUSTOM_CONF}/*.conf" %>;
+
     # include standard helpers
     include                         helpers/nginx-ignore-favicon.conf;
     include                         helpers/nginx-static-files.conf;
diff --git a/overlay/usr/bin/bf/ssl-regenerate b/overlay/usr/bin/bf/ssl-regenerate
index 1ca6295..8bae1cf 100644
--- a/overlay/usr/bin/bf/ssl-regenerate
+++ b/overlay/usr/bin/bf/ssl-regenerate
@@ -5,12 +5,33 @@ export BF_E=`basename ${0}`
 
 
 #======================================================================================================================
-# Delete SSL files and reinitialise.
+# Remove specified domain (or all domains).
 #======================================================================================================================
 
-bf-echo "Removing SSL certificates and configuration..."
-bf-rmrf "${PROXY_SSL_CERTS}/*"
-bf-done
+if [ -n "${1-}" ] ; then
+
+    DOMAIN=${1}
+    [[ ! -d "${PROXY_SSL_CERTS}/${DOMAIN}" ]] && bf-error "Domain ${DOMAIN} has not been setup for SSL."
+
+    bf-echo "Removing SSL certificates and configuration for ${DOMAIN}..."
+    rm -r \
+        "${PROXY_SSL_CERTS}/${DOMAIN}" \
+        "${PROXY_SSL_CERTS}/${DOMAIN}.crt" \
+        "${PROXY_SSL_CERTS}/${DOMAIN}.key"
+    bf-done
+
+else
+
+    bf-echo "Removing SSL certificates and configuration..."
+    bf-rmrf "${PROXY_SSL_CERTS}/*"
+    bf-done
+
+fi
+
+
+#======================================================================================================================
+# Reinitialise SSL.
+#======================================================================================================================
 
 cd ${PROXY_LIB}
 s6-setuidgid www ./init && ./request