diff --git a/Rakefile b/Rakefile
index e27970c..b32f2b0 100644
--- a/Rakefile
+++ b/Rakefile
@@ -28,15 +28,27 @@ def templated_build(name, opts={})
     sh "mkdir -p #{opts[:location]}" if opts[:location]
     sh "cat #{source}/#{target_js}.tpl.pre mustache.js \
      #{source}/#{target_js}.tpl.post > #{opts[:location] || '.'}/#{target_js}"
-    puts "Done, see #{opts[:location] || '.'}/#{target_js}"
+
+    # extra
+    if opts[:extra]
+      sh "cat #{source}/#{opts[:extra]} | sed -e 's/{{version}}/#{version}/' > #{opts[:location]}/#{opts[:extra]}"
+     end
+
+   puts "Done, see #{opts[:location] || '.'}/#{target_js}"
+
   end
 end
 
-templated_build "CommonJS", :location => "lib"
+templated_build "CommonJS", :location => "lib", :extra => "package.json"
 templated_build "jQuery"
 templated_build "Dojo", :location => "dojox/string"
 templated_build "YUI3", :location => "yui3/mustache"
 
+def version
+  File.read("mustache.js").match('version: "([^\"]+)",$')[1]
+end
+
+
 desc "Remove temporary files."
 task :clean do
   sh "git clean -fdx"
diff --git a/mustache-commonjs/package.json b/mustache-commonjs/package.json
new file mode 100644
index 0000000..74d3aba
--- /dev/null
+++ b/mustache-commonjs/package.json
@@ -0,0 +1,7 @@
+{
+    "name": "mustache",
+    "author": "http://mustache.github.com/",
+    "description": "{{ mustache }} in JavaScript — Logic-less templates.",
+    "keywords": ["template"],
+    "version": "{{version}}"
+}
diff --git a/package.json b/package.json
deleted file mode 100644
index 54a86f9..0000000
--- a/package.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "name": "mustache",
-    "author": "Jan Lehnardt",
-    "description": "{{mustaches}} in JavaScript — shameless port from @defunkt",
-    "keywords": ["template"],
-    "version": "0.2.3"
-}