diff --git a/README.md b/README.md
index b08fab2c..c3623bb4 100644
--- a/README.md
+++ b/README.md
@@ -39,7 +39,7 @@ dependencies {
    compile "org.springframework.shell:spring-shell:${version}"
 }
 ~~~~~
-current version is 1.0.0.SNAPSHOT
+current version is 1.0.0.BUILD-SNAPSHOT
 
 # Building
 
@@ -53,7 +53,7 @@ To build Spring Shell, run
 
     cd samples/helloworld
     mvn package
-    java -jar target/helloworld-1.0.0.SNAPSHOT.jar
+    java -jar target/helloworld-1.0.0.BUILD.SNAPSHOT.jar
      
 # Contributing
 
diff --git a/gradle.properties b/gradle.properties
index 61e1fa0c..aed2b8d2 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -32,4 +32,4 @@ thrift.range = "[0.7, 0.8)"
 # --------------------
 # Project wide version
 # --------------------
-springShellVersion=1.0.0.SNAPSHOT
\ No newline at end of file
+springShellVersion=1.0.0.BUILD-SNAPSHOT
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 72a9f397..5b9414b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.shell</groupId>
 	<artifactId>spring-shell</artifactId>
-	<version>1.0.0.SNAPSHOT</version>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>Spring Shell</name>
 	<url>http://www.springframework.org</url>
diff --git a/samples/helloworld/build.gradle b/samples/helloworld/build.gradle
index bf013318..174cc686 100644
--- a/samples/helloworld/build.gradle
+++ b/samples/helloworld/build.gradle
@@ -1,4 +1,5 @@
 description = 'Hello World - Spring Shell'
+version = "$helloworldVersion"
 
 apply plugin: 'base'
 apply plugin: 'java'
diff --git a/samples/helloworld/gradle.properties b/samples/helloworld/gradle.properties
index 60ddbd0e..752d62e0 100644
--- a/samples/helloworld/gradle.properties
+++ b/samples/helloworld/gradle.properties
@@ -1,2 +1,4 @@
 springVersion = 3.1.1.RELEASE
-springShellVersion=1.0.0.SNAPSHOT
\ No newline at end of file
+springShellVersion=1.0.0.BUILD-SNAPSHOT
+
+helloworldVersion=1.0.0.BUILD-SNAPSHOT
\ No newline at end of file
diff --git a/samples/helloworld/pom.xml b/samples/helloworld/pom.xml
index ca0b4d25..d80c68a1 100644
--- a/samples/helloworld/pom.xml
+++ b/samples/helloworld/pom.xml
@@ -4,14 +4,14 @@
 
 	<groupId>org.springframework.shell.samples</groupId>
 	<artifactId>helloworld</artifactId>
-	<version>1.0.0.SNAPSHOT</version>
+	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>helloworld</name>
 	<url>http://maven.apache.org</url>
 
 	<properties>
-		<spring.shell.version>1.0.0.SNAPSHOT</spring.shell.version>
+		<spring.shell.version>1.0.0.BUILD-SNAPSHOT</spring.shell.version>
 		<jar.mainclass>org.springframework.shell.Bootstrap</jar.mainclass>
 	</properties>
 
diff --git a/samples/helloworld/readme.txt b/samples/helloworld/readme.txt
index 08d0da1a..40de4e2f 100644
--- a/samples/helloworld/readme.txt
+++ b/samples/helloworld/readme.txt
@@ -4,7 +4,7 @@ Maven:
   $>mvn package
   
 2.run spring shell
-  $>java -jar target/helloworld-1.0.0.SNAPSHOT.jar
+  $>java -jar target/helloworld-1.0.0.BUILD-SNAPSHOT.jar
   
 
   
@@ -14,4 +14,4 @@ Gradle:
   $>../../gradlew build
   
 2.run spring shell
-  $>java -jar build/libs/helloworld.jar
\ No newline at end of file
+  $>java -jar build/libs/helloworld-1.0.0.BUILD-SNAPSHOT.jar
\ No newline at end of file