diff --git a/xdm.changes b/xdm.changes
index 9191d6c..cdba057 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Feb 21 13:52:09 UTC 2018 - sndirsch@suse.com
+
+- switch from SUSEfirewall2 to firewalld:
+  /etc/sysconfig/SuSEfirewall2.d/services/xdmcp -->
+  /usr/lib/firewalld/services/x11.xml; only handle Xserver TCP/UDP
+  ports 6000-6063; XDMCP port 177 will be handled by firewalld
+  package itself and pushed upstream by firewalld maintainers
+  (boo#1082033)
+
 -------------------------------------------------------------------
 Thu Feb  8 11:14:41 UTC 2018 - sndirsch@suse.com
 
diff --git a/xdm.spec b/xdm.spec
index 99f77a4..8b07951 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -67,6 +67,9 @@ BuildRequires:  pkgconfig(xorg-macros) >= 1.4
 BuildRequires:  pkgconfig(xpm)
 BuildRequires:  pkgconfig(xt)
 BuildRequires:  pkgconfig(xtrans)
+%if 0%{?suse_version} > 1320
+BuildRequires:  firewall-macros
+%endif
 Requires:       /sbin/pidof
 Requires:       logrotate
 Requires:       sessreg
@@ -145,6 +148,16 @@ rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
 pushd %{buildroot}
 # SuSE default XDM configuration
 tar xf %{SOURCE1}
+%if 0%{?suse_version} > 1320
+rm    etc/sysconfig/SuSEfirewall2.d/services/xdmcp
+rmdir etc/sysconfig/SuSEfirewall2.d/services
+rmdir etc/sysconfig/SuSEfirewall2.d
+rmdir etc/sysconfig
+%else
+rm    usr/lib/firewalld/services/x11.xml
+rmdir usr/lib/firewalld/services
+rmdir usr/lib/firewalld
+%endif
 %if 0%{?suse_version} >= 1330
 patch -p1 < %{PATCH2}
 %endif
@@ -218,6 +231,9 @@ fi
 %{_sbindir}/update-alternatives --install %{_libexecdir}/X11/displaymanagers/default-displaymanager \
   default-displaymanager %{_libexecdir}/X11/displaymanagers/xdm 10
 %endif
+%if 0%{?suse_version} > 1320
+%firewalld_reload
+%endif
 
 %pre
 %if !0%{?suse_version} < 1315
@@ -264,7 +280,13 @@ fi
 %endif
 %config %{_sysconfdir}/X11/xdm/
 %dir %{_sysconfdir}/X11/xdm/scripts
+%if 0%{?suse_version} > 1320
+%dir %{_libexecdir}/firewalld
+%dir %{_libexecdir}/firewalld/services
+%{_libexecdir}/firewalld/services/x11.xml
+%else
 %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
+%endif
 %if 0%{?suse_version} < 1315
 %{_sysconfdir}/init.d/xdm
 %exclude %{_libexecdir}/X11/display-manager
diff --git a/xdm.tar.bz2 b/xdm.tar.bz2
index 7b4dadb..ef72a8c 100644
--- a/xdm.tar.bz2
+++ b/xdm.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a43bf0e247b6b238b016d7c1cc4f248ad06c9d8a8a5a0d3bc838c84873cadd7b
-size 23626
+oid sha256:cf6e4a2f312976fec1cf6c0f8a1f6d3e0a7077e654f26a2bc06a24119c28f35a
+size 23754