diff --git a/build.gradle b/build.gradle
index 0bb73b7181..0f7a6805ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -99,6 +99,9 @@ configure(javaprojects) {
     // add tasks for creating source jars and generating poms etc
     apply from: "$rootDir/buildSrc/maven-deployment.gradle"
 
+    // add tasks for finding and publishing .xsd files
+    apply from: "$rootDir/gradle/schema-publication.gradle"
+
     aspectjVersion = '1.6.8'
     cglibVersion = '2.2'
     commonsIoVersion = '1.4'
diff --git a/buildSrc b/buildSrc
index 70cb55ebdb..522c0d1a46 160000
--- a/buildSrc
+++ b/buildSrc
@@ -1 +1 @@
-Subproject commit 70cb55ebdbecd57b0618aa2b9a733ce86b98e25e
+Subproject commit 522c0d1a4696c941dc36bd6210081e042efcd48f