diff --git a/.gitignore b/.gitignore
index 212af7e2..1ee61d4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ gen
 assets/www/phonegap.js
 local.properties
 framework/phonegap.jar
+framework/phonegap-*.jar
 framework/bin
 framework/assets/www/.DS_Store
+framework/assets/www/phonegap-*.js
 .DS_Store
diff --git a/framework/build.xml b/framework/build.xml
index dd26e36e..8e0e1ce9 100755
--- a/framework/build.xml
+++ b/framework/build.xml
@@ -173,7 +173,7 @@
             "build-javascript" => "build-uncompressed-javascript".
     -->
     <target name="jar" depends="build-javascript, compile">
-      <jar jarfile="phonegap.${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
+      <jar jarfile="phonegap-${version}.jar" basedir="bin/classes" excludes="com/phonegap/R.class,com/phonegap/R$*.class"/>
     </target>
 
     <target name="phonegap_debug" depends="build-javascript, debug">