diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 82e3c14..2b550a4 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Sun Jan 10 18:59:29 UTC 2016 - eich@suse.com
+
+- Add test for defined macro %build_xwayland
+  This can be used to enable the build of Xwayland and the
+  package xorg-x11-server-wayland using a macro in projconf
+  (boo#960487).
+
+-------------------------------------------------------------------
+Fri Jan  8 17:42:18 UTC 2016 - eich@suse.com
+
+- Split out Xwayland:
+  * Build a package xorg-x11-server-wayland
+  * Limit build to Factory (boo#960487).
+
 -------------------------------------------------------------------
 Sat Jan  2 18:47:27 UTC 2016 - hrvoje.senjan@gmail.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index f26fb91..492db15 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -19,7 +19,7 @@
 %ifarch s390 s390x
 %define have_wayland 0
 %else
-%if 0%{?suse_version} >= 1320 || 0%{?is_opensuse}
+%if 0%{?suse_version} >= 1330 || 0%{?build_xwayland}
 %define have_wayland 1
 %endif
 %endif
@@ -205,6 +205,18 @@ Obsoletes:      xorg-x11-Xnest
 %description extra
 This package contains additional Xservers (Xdmx, Xephyr, Xnest).
 
+%if 0%{?have_wayland} == 1
+%package wayland
+Summary:        Xwayland Xserver
+Group:          System/X11/Servers/XF86_4
+Requires:       xkbcomp
+Requires:       xkeyboard-config
+Requires:       xorg-x11-fonts-core
+
+%description wayland
+This package contains the Xserver running on the Wayland Display Server.
+%endif
+
 %package sdk
 Summary:        X
 Group:          System/Libraries
@@ -475,12 +487,14 @@ fi
 %ghost %{_sysconfdir}/alternatives/libglx.so
 %endif
 %endif
-%if 0%{?have_wayland} == 1
-%{_bindir}/Xwayland
-%endif
 %{_bindir}/Xvfb
 %{_bindir}/xorg-backtrace
 
+%if 0%{?have_wayland} == 1
+%files wayland
+%{_bindir}/Xwayland
+%endif
+
 %files extra
 %defattr(-,root,root)
 %{_bindir}/Xephyr