diff --git a/exim.changes b/exim.changes
index 2071530..5157014 100644
--- a/exim.changes
+++ b/exim.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Mar 15 20:22:09 UTC 2018 - crrodriguez@opensuse.org
+
+- Replace xorg-x11-devel by individual pkgconfig() buildrequires. 
+
 -------------------------------------------------------------------
 Tue Feb 13 13:39:34 UTC 2018 - kbabioch@suse.com
 
diff --git a/exim.spec b/exim.spec
index 9cd8e75..da27da6 100644
--- a/exim.spec
+++ b/exim.spec
@@ -47,17 +47,12 @@ BuildRequires:  pam-devel
 BuildRequires:  openldap2-devel
 %endif
 BuildRequires:  pcre-devel
-%if %{?suse_version:1}%{?!suse_version:0}
-BuildRequires:  libopenssl-devel
 BuildRequires:  tcpd-devel
-BuildRequires:  xorg-x11-devel
-%else
-BuildRequires:  libXaw-devel
-BuildRequires:  libXext-devel
-BuildRequires:  libXt-devel
-BuildRequires:  openssl-devel
-BuildRequires:  tcp_wrappers
-%endif
+BuildRequires:  pkgconfig(libcrypto)
+BuildRequires:  pkgconfig(libssl)
+BuildRequires:  pkgconfig(xaw7)
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(xt)
 Url:            http://www.exim.org/
 Conflicts:      sendmail sendmail-tls postfix
 Provides:       smtp_daemon
@@ -90,7 +85,7 @@ BuildRequires:  postgresql-devel
 BuildRequires:  sqlite3-devel
 %endif
 Summary:        The Exim Mail Transfer Agent, a Replacement for sendmail
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Email/Servers
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source:         http://ftp.exim.org/pub/exim/exim4/exim-%{version}.tar.bz2