diff --git a/emacs-26.1-xft4x11.patch b/emacs-26.1-xft4x11.patch
new file mode 100644
index 0000000..6d00db7
--- /dev/null
+++ b/emacs-26.1-xft4x11.patch
@@ -0,0 +1,33 @@
+---
+ lwlib/xlwmenu.c |   13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+--- lwlib/xlwmenu.c
++++ lwlib/xlwmenu.c	2018-06-15 05:50:45.749287186 +0000
+@@ -1887,21 +1887,18 @@ XlwMenuInitialize (Widget request, Widge
+ 				   gray_width, gray_height,
+ 				   (unsigned long)1, (unsigned long)0, 1);
+ 
++  mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
+ #ifdef HAVE_XFT
+-  if (openXftFont (mw))
++  if (mw->menu.font || openXftFont (mw))
+     ;
+   else
+ #endif
+     {
+-      mw->menu.font = XLoadQueryFont (display, mw->menu.fontName);
++      mw->menu.font = XLoadQueryFont (display, "fixed");
+       if (!mw->menu.font)
+         {
+-          mw->menu.font = XLoadQueryFont (display, "fixed");
+-          if (!mw->menu.font)
+-            {
+-              fprintf (stderr, "Menu font fixed not found, can't continue.\n");
+-              emacs_abort ();
+-            }
++          fprintf (stderr, "Menu font fixed not found, can't continue.\n");
++          emacs_abort ();
+         }
+     }
+ 
diff --git a/emacs.changes b/emacs.changes
index ec4e492..2b03bdb 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Fri Jun 15 05:14:18 UTC 2018 - werner@suse.de
+
+- Simplify patch emacs-25.3-xft4x11.patch (from Henryk Hecht) for
+  boo#1096354 
+
+-------------------------------------------------------------------
+Tue Jun 12 07:52:20 UTC 2018 - werner@suse.de
+
+- Add patch emacs-26.1-xft4x11.patch to allow emacs-x11 to use
+  xft even for its menu bar (boo#1096354)
+
+-------------------------------------------------------------------
+Fri Jun  8 17:35:59 UTC 2018 - bjorn.lie@gmail.com
+
+- Drop pkgconfig(gconf-2.0) BuildRequires: No longer needed, nor
+  used. Emacs-x11 uses gsettings on openSUSE.
+
 -------------------------------------------------------------------
 Thu Jun  7 13:05:03 UTC 2018 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 516efef..e107a63 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -68,11 +68,12 @@ BuildRequires:  xz
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(com_err)
 BuildRequires:  pkgconfig(dbus-1)
-BuildRequires:  pkgconfig(gconf-2.0)
+BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(libacl)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(sm)
@@ -88,7 +89,9 @@ BuildRequires:  pkgconfig(xmu)
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xshmfence)
 BuildRequires:  pkgconfig(xt)
+BuildRequires:  pkgconfig(xxf86vm)
 Url:            http://www.gnu.org/software/emacs/
 Version:        26.1
 Release:        0
@@ -259,7 +262,7 @@ if test -s autogen.sh ; then
     ln -sf /bin/true autogen.sh
 fi
 %else
-autoreconf -fiv
+autoreconf -fiv -I $PWD -I $PWD/m4
 %endif
 
 # make sure that the binaries work (pagesize on build must be the same as on target, bnc#726769)