diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 93cdaea..17ea6b4 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Feb  5 13:37:11 UTC 2015 - msrb@suse.com
+
+- Add xorg-x11-server-source package that contains patched xserver
+  sources used to build xorg-x11-Xvnc.
+
 -------------------------------------------------------------------
 Tue Nov 18 10:34:53 UTC 2014 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index fab3d2a..1154d1a 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xorg-x11-server
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -216,6 +216,13 @@ Obsoletes:      glamor-devel < %{version}
 %description sdk
 This package contains the X.Org Server SDK.
 
+%package source
+Summary:        Source code of X.Org server
+Group:          Development/Sources
+
+%description source
+This package contains patched sources of X.Org Server.
+
 %prep
 %setup -q -n xorg-server-%{dirsuffix} -a3
 # Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end.
@@ -255,6 +262,8 @@ cp %{SOURCE90} .
 %patch201 -p1
 %patch202 -p1
 
+find . -type f \! -name '*.orig' \! -path ./source-file-list > source-file-list
+
 %build
 autoreconf -fi
 %configure CFLAGS="%{optflags} -fno-strict-aliasing" \
@@ -363,6 +372,9 @@ ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/module
 %endif
 %endif
 
+mkdir -p %{buildroot}/usr/src/xserver
+xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file-list
+
 %post
 %ifnarch s390 s390x
 %{fillup_only -an displaymanager}
@@ -475,4 +487,7 @@ fi
 %endif
 %{_sysconfdir}/rpm/macros.xorg-server
 
+%files source
+/usr/src/xserver
+
 %changelog