diff --git a/xdm.changes b/xdm.changes
index ce5f237..754e6f3 100644
--- a/xdm.changes
+++ b/xdm.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jul 24 13:43:35 UTC 2017 - sndirsch@suse.com
+
+- %post
+  * Do no try to start Xserver on platforms which may ship without
+    graphics card (bsc#1039497)
+
 -------------------------------------------------------------------
 Mon Feb  6 13:20:21 UTC 2017 - sndirsch@suse.com
 
diff --git a/xdm.spec b/xdm.spec
index 3fe8100..31435c4 100644
--- a/xdm.spec
+++ b/xdm.spec
@@ -173,6 +173,14 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
 %endif
 
 %post
+# Do no try to start Xserver on platforms which may ship without
+# graphics card (bsc#1039497)
+%ifarch aarch64 ppc64le
+if ! [ -c /dev/fb* -o -d /dev/dri ]; then
+    sed -i -e "s+DISPLAYMANAGER_STARTS_XSERVER=.*+DISPLAYMANAGER_STARTS_XSERVER=\"no\"+g" \
+              var/adm/fillup-templates/sysconfig.displaymanager
+fi
+%endif
 %if 0%{?suse_version} < 1315
 %{fillup_and_insserv -Y xdm}
 %else