diff --git a/stable/mailhog/Chart.yaml b/stable/mailhog/Chart.yaml
index 5d0a655248..894a416480 100644
--- a/stable/mailhog/Chart.yaml
+++ b/stable/mailhog/Chart.yaml
@@ -1,7 +1,8 @@
 apiVersion: v1
 description: An e-mail testing tool for developers
 name: mailhog
-version: 1.1.0
+appVersion: 1.0.0
+version: 1.2.0
 keywords:
   - mailhog
   - mail
@@ -14,5 +15,5 @@ icon: https://raw.githubusercontent.com/mailhog/MailHog-UI/master/assets/images/
 sources:
   - https://github.com/mailhog/MailHog
 maintainers:
-  - name: Reinhard Nägele
+  - name: unguiculus
     email: unguiculus@gmail.com
diff --git a/stable/mailhog/templates/ingress.yaml b/stable/mailhog/templates/ingress.yaml
index 0c793496a1..0d1b33f9fd 100644
--- a/stable/mailhog/templates/ingress.yaml
+++ b/stable/mailhog/templates/ingress.yaml
@@ -1,4 +1,6 @@
 {{- if .Values.ingress.enabled }}
+{{- $fullName := include "fullname" . -}}
+{{- $path := .Values.ingress.path -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
@@ -11,22 +13,24 @@ metadata:
     chart: {{ .Chart.Name }}-{{ .Chart.Version }}
     heritage: {{ .Release.Service }}
     release: {{ .Release.Name }}
-  name: {{ template "fullname" . }}
+  name: {{ $fullName }}
 spec:
 {{- if .Values.ingress.tls.enabled }}
   tls:
     - hosts:
-        - {{ .Values.ingress.host }}
+      {{- range .Values.ingress.hosts }}
+        - {{ . }}
+      {{- end }}
       secretName: {{ template "tlsSecret" . }}
 {{- end }}
   rules:
-    - http:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . }}
+      http:
         paths:
-          - path: {{ .Values.ingress.path }}
+          - path: {{ $path }}
             backend:
-              serviceName: {{ template "fullname" . }}
+              serviceName: {{ $fullName }}
               servicePort: http
-    {{- if .Values.ingress.host }}
-      host: {{ .Values.ingress.host }}
-    {{- end }}
+  {{- end }}
 {{- end }}
diff --git a/stable/mailhog/values.yaml b/stable/mailhog/values.yaml
index 7c21b15227..d2fce67b4d 100644
--- a/stable/mailhog/values.yaml
+++ b/stable/mailhog/values.yaml
@@ -19,7 +19,8 @@ ingress:
   enabled: false
   annotations: {}
   path: /
-  host: mailhog.example.com
+  hosts: 
+    - mailhog.example.com
   tls:
     enabled: false
     existingSecret: false