diff --git a/x11/server/xorg-server/pspec.xml b/x11/server/xorg-server/pspec.xml
index 464e03cf4f..f0b000da7b 100755
--- a/x11/server/xorg-server/pspec.xml
+++ b/x11/server/xorg-server/pspec.xml
@@ -74,6 +74,9 @@
         <Name>xorg-server-common</Name>
         <IsA>data</IsA>
         <Summary>Common files for X servers</Summary>
+        <Conflicts>
+            <Package>xorg-xwayland</Package>
+        </Conflicts>
         <Files>
             <Path fileType="data">/etc/X11/fontpath.d</Path>
             <Path fileType="data">/etc/dbus-1</Path>
@@ -166,6 +169,9 @@
         <Name>xorg-server-xwayland</Name>
         <IsA>app:console</IsA>
         <Summary>Run X clients under wayland</Summary>
+        <Conflicts>
+            <Package>xorg-xwayland</Package>
+        </Conflicts>
         <RuntimeDependencies>
             <Dependency>libXau</Dependency>
             <Dependency>libXdmcp</Dependency>