diff --git a/ChangeLog b/ChangeLog
index 15acc1b6a..dddfb2b31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-26  Oliver Kiddle <opk@zsh.org>
+
+	* 35901: Completion/X/Type/_x_font: complete full names as removing
+	later components was broken for aliases and unwanted in any case
+
 2015-07-26  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
 
 	* Antony Lee: 35899: Completion/Unix/Type/_python_modules:
diff --git a/Completion/X/Type/_x_font b/Completion/X/Type/_x_font
index a363b2775..1202d821e 100644
--- a/Completion/X/Type/_x_font
+++ b/Completion/X/Type/_x_font
@@ -9,8 +9,8 @@ _tags fonts || return 1
 if (( ! $+_font_cache )); then
   typeset -gU _font_cache
 
- _font_cache=( "${(@)^${(@f)$(_call_program fonts xlsfonts 2> /dev/null)}%%--*}--" )
+ _font_cache=( ${(f)"$(_call_program fonts xlsfonts)"} )
 fi
 
 _wanted fonts expl font \
-    compadd -M 'r:|-=* r:|=*' "$@" -S '' -a - _font_cache
+    compadd -M 'r:|-=* r:|=*' "$@" -a - _font_cache