diff --git a/stable/memcached/Chart.yaml b/stable/memcached/Chart.yaml
index e10a8488de..63c8c26203 100644
--- a/stable/memcached/Chart.yaml
+++ b/stable/memcached/Chart.yaml
@@ -1,5 +1,5 @@
 name: memcached
-version: 2.0.4
+version: 2.1.0
 appVersion: 1.5.6
 description: Free & open source, high-performance, distributed memory object caching
   system.
diff --git a/stable/memcached/templates/_helpers.tpl b/stable/memcached/templates/_helpers.tpl
index 56c9c4e5e7..a7196fa67c 100644
--- a/stable/memcached/templates/_helpers.tpl
+++ b/stable/memcached/templates/_helpers.tpl
@@ -11,6 +11,14 @@ Create a default fully qualified app name.
 We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "memcached.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
 {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+{{- end -}}
+{{- end -}}