diff --git a/aspects/template.mf b/aspects/template.mf
new file mode 100644
index 0000000000..d6b60c1cf2
--- /dev/null
+++ b/aspects/template.mf
@@ -0,0 +1,12 @@
+Bundle-SymbolicName: org.springframework.security.aspects
+Bundle-Name: Spring Security Aspects
+Bundle-Vendor: SpringSource
+Bundle-ManifestVersion: 2
+Bundle-Version: ${version}
+Ignored-Existing-Headers:
+ Import-Package,
+ Export-Package
+Import-Template: 
+ org.aspectj.*;version="[1.6.0, 1.7.0)";resolution:=optional,
+ org.apache.commons.logging.*;version="[1.0.4, 2.0.0)",
+ org.springframework.security.core.*;version="[${version}, 3.2.0)"
diff --git a/build.gradle b/build.gradle
index 1b2b014c9b..f326aac803 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,7 +28,7 @@ allprojects {
 }
 
 allprojects {
-    apply plugin: 'org.gradle.idea'
+    apply plugin: 'idea'
     ideaModule {
         downloadJavadoc=false
         excludeDirs.add(buildDir)
@@ -51,15 +51,33 @@ ideaModule {
 ideaProject {
     wildcards += ['?*.gradle']
     javaVersion = '1.6'
-}
 
+    withXml { node ->
+        node.component.find { it.@name == 'VcsDirectoryMappings' }.mapping.@vcs = 'Git'
+    }
+}
+/*
+ideaWorkspace {
+    withXml { node ->
+        Node servers = node.component.find{ it.@name == 'TaskManager' }.servers[0]
+        def bldr = new NodeBuilder()
+        servers.append(
+            bldr.JIRA(shared: false, url: 'https://jira.springsource.org') {
+                if (project.hasProperty('jiraUser')) {
+                    password project.property('jiraPassword')
+                    username project.property('jiraUser')
+                }
+            })
+    }
+}
+*/
 configure(javaProjects) {
     apply from: "$rootDir/gradle/javaprojects.gradle"
-    apply from: "$rootDir/gradle/maven.gradle"
 }
 
 configure(coreModuleProjects) {
     apply from: "$rootDir/gradle/bundlor.gradle"
+    apply from: "$rootDir/gradle/maven.gradle"
     // Gives better names in structure101 jar diagram
     sourceSets.main.classesDir = new File(buildDir, "classes/" + project.name.substring("spring-security".length() + 1))
 }
@@ -187,11 +205,15 @@ def getItestProjects() {
 }
 
 def getCoreModuleProjects() {
-    javaProjects - sampleProjects - itestProjects - aspectjProjects
+    javaProjects - sampleProjects - itestProjects
 }
 
 def getAspectjProjects() {
-    subprojects.findAll {project -> project.name == 'spring-security-aspects' || project.name == 'spring-security-samples-aspectj'}
+    [project(':spring-security-aspects'), project(':spring-security-samples-aspectj')]
+}
+
+def getReleaseProjects() {
+    coreModuleProjects +project(':spring-security-aspects')
 }
 
 class UploadDist extends DefaultTask {
diff --git a/gradle/maven.gradle b/gradle/maven.gradle
index 5702d6a753..7c76a1b795 100644
--- a/gradle/maven.gradle
+++ b/gradle/maven.gradle
@@ -6,12 +6,16 @@ task sourceJar(type: Jar) {
     from sourceSets.main.java
 }
 
+artifacts {
+    archives sourceJar
+}
+
+// Configuration for SpringSource s3 maven deployer
 configurations {
     deployerJars
 }
-
-artifacts {
-    archives sourceJar
+dependencies {
+    deployerJars "org.springframework.build.aws:org.springframework.build.aws.maven:3.0.0.RELEASE"
 }
 
 // Remove the archive configuration from the runtime configuration, so that anything added to archives
@@ -20,10 +24,6 @@ configurations.default.extendsFrom = [configurations.runtime] as Set
 // Add the main jar into the default configuration
 artifacts { 'default' jar }
 
-dependencies {
-    deployerJars "org.springframework.build.aws:org.springframework.build.aws.maven:3.0.0.RELEASE"
-}
-
 gradle.taskGraph.whenReady {graph ->
     if (graph.hasTask(uploadArchives)) {
         // check properties defined and fail early
@@ -37,8 +37,6 @@ def deployer = null
 uploadArchives {
     deployer = repositories.mavenDeployer {
         configuration = configurations.deployerJars
-    }
-    doFirst {
         if (releaseBuild) {
             // "mavenSyncRepoDir" should be set in properties
             repository(url: mavenSyncRepoDir)