diff --git a/emacs.changes b/emacs.changes
index 1aa7d15..b7ad93c 100644
--- a/emacs.changes
+++ b/emacs.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Mar 14 21:08:52 UTC 2018 - crrodriguez@opensuse.org
+
+- Remove xorg-x11-devel from buildrequires, replace 
+  by an extense list of pkgconfig()-style dependencies.
+
 -------------------------------------------------------------------
 Fri Sep 22 10:06:54 UTC 2017 - werner@suse.de
 
diff --git a/emacs.spec b/emacs.spec
index 1c2845b..23d0b4f 100644
--- a/emacs.spec
+++ b/emacs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package emacs
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -36,6 +36,7 @@ BuildRequires:  cairo-devel
 %endif
 BuildRequires:  dbus-1-devel
 BuildRequires:  fdupes
+BuildRequires:  fontconfig-devel
 BuildRequires:  fonts-config
 BuildRequires:  freetype2-devel
 BuildRequires:  gconf2-devel
@@ -80,10 +81,26 @@ BuildRequires:  texinfo
 %endif
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
-BuildRequires:  xaw3d-devel
-BuildRequires:  xorg-x11-devel
 BuildRequires:  xz
 BuildRequires:  zlib-devel
+BuildRequires:  pkgconfig(com_err)
+BuildRequires:  pkgconfig(gio-2.0)
+BuildRequires:  pkgconfig(glib-2.0)
+BuildRequires:  pkgconfig(ice)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(sm)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(x11-xcb)
+BuildRequires:  pkgconfig(xaw3d)
+BuildRequires:  pkgconfig(xcb)
+BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xft)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(xpm)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xrender)
+BuildRequires:  pkgconfig(xt)
 Url:            http://www.gnu.org/software/emacs/
 Version:        25.3
 Release:        0
@@ -95,7 +112,7 @@ Requires:       ctags
 Requires:       emacs-info = %{version}
 Requires:       emacs_program = %{version}-%{release}
 Summary:        GNU Emacs Base Package
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          Productivity/Editors/Emacs
 Provides:       nxml-mode = 20041004
 Obsoletes:      nxml-mode < 20041004