diff --git a/srcpkgs/xerces-c-doc b/srcpkgs/xerces-c-doc
new file mode 120000
index 00000000000..17c953c82f5
--- /dev/null
+++ b/srcpkgs/xerces-c-doc
@@ -0,0 +1 @@
+xerces-c
\ No newline at end of file
diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index d0a1692ca54..00f8eebea3b 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.1.2
-revision=3
+revision=4
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel icu55-devel"
@@ -10,13 +10,19 @@ short_desc="Validating XML parser written in portable C++"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
 license="Apache-2.0"
 homepage="http://xerces.apache.org/xerces-c/"
-distfiles="http://apache.mirror.digionline.de//xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
+distfiles="http://archive.apache.org/dist/xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
 checksum=95d8655c4c50668ad60d555b59da9f31937b2c53638aa8d5768cb169f192d5e1
 
 case "$XBPS_TARGET_MACHINE" in
 	i686*) export CCACHE_DISABLE=yes
 esac
 
+pre_build() {
+	# Copy samples before build: avoid binaries in -doc package
+	mkdir -p _docs
+	cp -a samples/ _docs/
+}
+
 libxerces-c_package() {
 	short_desc+=" - shared library"
 	pkg_install() {
@@ -34,3 +40,13 @@ libxerces-c-devel_package() {
 		vmove usr/lib/libxerces-c.so
 	}
 }
+
+xerces-c-doc_package() {
+	short_desc+=" - documentation"
+	noarch=yes
+	pkg_install() {
+		vdoc "CREDITS"
+		vcopy "${wrksrc}/doc"           "/usr/share/doc/${pkgname}"
+		vcopy "${wrksrc}/_docs/samples" "/usr/share/doc/${pkgname}"
+	}
+}