diff --git a/app-defaults.Emacs b/app-defaults.Emacs
index aa1a87d..6755cde 100644
--- a/app-defaults.Emacs
+++ b/app-defaults.Emacs
@@ -7,7 +7,8 @@ Emacs.menu*.font:		-*-helvetica-bold-r-normal--12-*-*-*-p-*-iso8859-*
 
 ! With GNU Emacs 24 Xft is used, therefore no fontsets are required. If you
 ! like to use fontsets you have to disable "FontBackend" and enable "Font".
-Emacs.FontBackend:		xft
+! If Xft fails then X font scheme (including fontsets) is used as fallback.
+Emacs.FontBackend:		xft,x
 !!Emacs.Font:			fontset-16
 Emacs*Fontset-0:\
 	-*-fixed-medium-r-*--16-*-*-*-*-*-fontset-16,\
diff --git a/emacs.changes b/emacs.changes
index c57f2c6..494d1e4 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep  1 10:05:35 UTC 2015 - werner@suse.de
+
+- Allow both Xft and as fallback the old X font scheme (boo#943793)
+
 -------------------------------------------------------------------
 Tue Jul 28 14:50:45 UTC 2015 - werner@suse.de