diff --git a/.gitignore b/.gitignore
index 931062ae..0a2019cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ target
 *.iml
 *.ipr
 *.iws
+.idea
 out
 
 gradle-app.setting
diff --git a/build.gradle b/build.gradle
index ba5e2791..53110774 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
 		maven { url "http://repo.springsource.org/plugins-snapshot" }
 	}
 	dependencies {
-		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.5")
-		classpath("org.springframework.build.gradle:docbook-reference-plugin:0.2.8")
+		classpath("org.springframework.build.gradle:propdeps-plugin:0.0.7")
+		classpath("io.spring.gradle:docbook-reference-plugin:0.3.1")
 		classpath("me.champeau.gradle:gradle-javadoc-hotfix-plugin:0.1")
 	}
 }
diff --git a/publish-maven.gradle b/publish-maven.gradle
index a02e5a30..6090186d 100644
--- a/publish-maven.gradle
+++ b/publish-maven.gradle
@@ -22,10 +22,10 @@ def customizePom(pom, gradleProject) {
 		generatedPom.project {
 			name = gradleProject.description
 			description = gradleProject.description
-			url = "https://github.com/SpringSource/spring-webflow"
+			url = "https://github.com/spring-projects/spring-webflow"
 			organization {
-				name = "SpringSource"
-				url = "http://springsource.org/spring-webflow"
+				name = "Spring IO"
+				url = "http://projects.spring.io/spring-webflow"
 			}
 			licenses {
 				license {
@@ -35,22 +35,21 @@ def customizePom(pom, gradleProject) {
 				}
 			}
 			scm {
-				url = "https://github.com/SpringSource/spring-webflow"
-				connection = "scm:git:git://github.com/SpringSource/spring-webflow"
-				developerConnection = "scm:git:git://github.com/SpringSource/spring-webflow"
+				url = "https://github.com/spring-projects/spring-webflow"
+				connection = "scm:git:git://github.com/spring-projects/spring-webflow"
+				developerConnection = "scm:git:git://github.com/spring-projects/spring-webflow"
 			}
 			developers {
 				developer {
 					id = "rstoyanchev"
 					name = "Rossen Stoyanchev"
-					email = "rstoyanchev@vmware.com"
-				}
-				developer {
-					id = "pwebb"
-					name = "Phil Webb"
-					email = "pwebb@vmware.com"
+					email = "rstoyanchev@pivotal.io"
 				}
 			}
+			issueManagement {
+				system = "Jira"
+				url = "https://jira.spring.io/browse/SWF"
+			}
 		}
 	}
 }