diff --git a/Makefile b/Makefile
index a5ad917..f8a59ad 100644
--- a/Makefile
+++ b/Makefile
@@ -28,6 +28,10 @@ socat-server: certs
 		EXEC:${SERVE_REQUEST}
 
 
+.PHONY: stunnel-server
+stunnel-server: certs
+	stunnel stunnel.conf
+
 ### Certificates ---------------------------------------------------------------
 
 .PHONY: show-cert
diff --git a/stunnel.conf b/stunnel.conf
new file mode 100644
index 0000000..5868b60
--- /dev/null
+++ b/stunnel.conf
@@ -0,0 +1,27 @@
+debug = info
+foreground = yes
+output = /dev/stdout
+pid = ./stunnel.pid
+service = gebase_stunnel
+
+[gemini]
+
+accept = 1965
+cert = certs/localhost.crt
+key = certs/localhost.key
+exec = ./serve-request.sh
+
+[localhost]
+
+sni = gemini:localhost
+cert = certs/localhost.crt
+key = certs/localhost.key
+exec = ./serve-request.sh
+
+; Domain support example:
+; [example.org]
+;
+; sni = gemini:example.org
+; cert = certs/example.org.crt
+; key = certs/example.org.key
+; exec = ./serve-request.sh