diff --git a/app-defaults.Emacs b/app-defaults.Emacs
index f37cda9..aa1a87d 100644
--- a/app-defaults.Emacs
+++ b/app-defaults.Emacs
@@ -2,9 +2,13 @@
 !				Emacs
 ! ==========================================================================
 
-Emacs.Font:			fontset-16
 Emacs.pane.menubar.font:	-*-helvetica-bold-r-normal--12-*-*-*-p-*-iso8859-*
 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
+!!Emacs.Font:			fontset-16
 Emacs*Fontset-0:\
 	-*-fixed-medium-r-*--16-*-*-*-*-*-fontset-16,\
 	latin-iso8859-1:-*-fixed-medium-r-*--16-*-iso8859-1,\
diff --git a/emacs.changes b/emacs.changes
index 79a448e..0d849dd 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jun  6 16:13:16 UTC 2013 - werner@suse.de
+
+- Disable fontsets and enforce Xft as font backend 
+
 -------------------------------------------------------------------
 Tue May 28 09:58:49 UTC 2013 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 0bed255..c8b4677 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -311,7 +311,6 @@ export CC CFLAGS LANG LC_CTYPE LDFLAGS
 "
 DESKTOP="--with-x \
 	 --with-sound \
-	 --with-sync-input \
 	 --with-xpm \
 	 --with-jpeg \
 	 --with-tiff \