diff --git a/build.gradle b/build.gradle
index 91fc7bf0bb3acb2158b5e531ca1656dc7b7461f8..76165395b8475986e54e04b992af7159e35ec6d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -40,8 +40,9 @@ description = 'ASM, a very small and fast Java bytecode manipulation framework'
 subprojects {
   repositories { mavenCentral() }
   apply plugin: 'java'
+  def snapshotSuffix = rootProject.hasProperty('release') ? '' : '-SNAPSHOT'
   group = 'org.ow2.asm'
-  version = '6.1'
+  version = '6.1.1' + snapshotSuffix
   sourceCompatibility = '1.6'
   targetCompatibility = '1.6'
   test { useJUnitPlatform() }
@@ -300,9 +301,14 @@ configure(subprojects.findAll { it.provides }) {
   // project POM and to upload it, with the classes, sources and Javadoc jars.
   apply plugin: 'maven'
   uploadArchives.repositories.mavenDeployer {
-    if (rootProject.hasProperty('nexusUserName')) {
-      repository(url: 'http://repository.ow2.org/nexus/service/local/' + 
-          'staging/deploy/maven2') {
+    def nexusUserName = System.env.NEXUS_USER_NAME
+    def nexusPassword = System.env.NEXUS_PASSWORD
+    if (nexusUserName != null) {
+      def baseUrl = 'http://repository.ow2.org/nexus/'
+      repository(url: baseUrl + 'service/local/staging/deploy/maven2') {
+        authentication(userName: nexusUserName, password: nexusPassword)
+      }
+      snapshotRepository(url: baseUrl + 'content/repositories/snapshots') {
         authentication(userName: nexusUserName, password: nexusPassword)
       }
     } else {