diff --git a/templates/mailhog/0/README.md b/templates/mailhog/0/README.md
new file mode 100644
index 0000000..8e00b33
--- /dev/null
+++ b/templates/mailhog/0/README.md
@@ -0,0 +1 @@
+The mailhog catalog configuration provides SMTP access on the internal network by default. External SMTP access can be exposed through a TCP Rancher load balancer routing to internal port 25. The Mailhog UI can be exposed through an HTTP(S) Rancher Load Balancer routing to internal port 8025. 
diff --git a/templates/mailhog/0/docker-compose.yml b/templates/mailhog/0/docker-compose.yml
new file mode 100644
index 0000000..807d04d
--- /dev/null
+++ b/templates/mailhog/0/docker-compose.yml
@@ -0,0 +1,12 @@
+version: '2'
+services:
+  mailhog:
+    image: mailhog/mailhog:v1.0.0
+    environment:
+      MH_UI_WEB_PATH: ${mh_ui_web_path}
+      MH_SMTP_BIND_ADDR: ${mh_smtp_bind_addr}
+    stdin_open: true
+    tty: true
+    user: root
+    labels:
+      io.rancher.container.pull_image: always
diff --git a/templates/mailhog/0/rancher-compose.yml b/templates/mailhog/0/rancher-compose.yml
new file mode 100644
index 0000000..52e2d79
--- /dev/null
+++ b/templates/mailhog/0/rancher-compose.yml
@@ -0,0 +1,15 @@
+.catalog:
+  name: MailHog
+  version: 0.0.1
+  description: MailHog E-mail Capture Tools
+  questions:
+    - variable: mh_ui_web_path
+      label: Web UI Path
+      type: string
+      description: Defines the URL path for viewing MailHog. Will use "/" if left blank.
+    - variable: mh_smtp_bind_addr
+      label: SMTP Bind Address
+      type: string
+      required: true
+      default: 0.0.0.0:25
+      description: Defines the IP/Port combination for the SMTP listener.
diff --git a/templates/mailhog/catalogIcon-mailhog.png b/templates/mailhog/catalogIcon-mailhog.png
new file mode 100644
index 0000000..c846729
Binary files /dev/null and b/templates/mailhog/catalogIcon-mailhog.png differ
diff --git a/templates/mailhog/config.yml b/templates/mailhog/config.yml
new file mode 100644
index 0000000..484b4e2
--- /dev/null
+++ b/templates/mailhog/config.yml
@@ -0,0 +1,4 @@
+name: MailHog
+description: MailHog E-mail Capture Tools
+version: 0.0.1
+category: Services