diff --git a/autoload/neosnippet/snippets/scala.snip b/autoload/neosnippet/snippets/scala.snip
index 7917278..409bb9f 100644
--- a/autoload/neosnippet/snippets/scala.snip
+++ b/autoload/neosnippet/snippets/scala.snip
@@ -15,13 +15,11 @@ prev_word   '^'
 
 snippet     p
 abbr        println()
-prev_word   '^'
-	println(${1})${0}
+	println(${1})
 
 snippet     pn
 abbr        println('name, name)
-prev_word   '^'
-	println('${1:name}, $1)${0}
+	println('${1:name}, $1)
 
 snippet     main
 abbr        def main(args: Array[String]) {
@@ -32,6 +30,7 @@ prev_word   '^'
 
 snippet     hello
 abbr        object HelloWorld { def main(...) }
+prev_word   '^'
 	object HelloWorld {
 		def main(args: Array[String]) {
 			println("Hello, world!")
diff --git a/doc/neosnippet.txt b/doc/neosnippet.txt
index 4415482..3b0a8eb 100644
--- a/doc/neosnippet.txt
+++ b/doc/neosnippet.txt
@@ -443,6 +443,9 @@ snippet					*neosnippet-unite-action-snippet*
 ==============================================================================
 CHANGELOG			*neosnippet-changelog*
 
+2012-10-20
+- Improved scala snip.
+
 2012-10-19
 - Fixed syntax highlight.
 - Improved documentation.