diff --git a/mozilla/extensions/xforms/package/Makefile.in b/mozilla/extensions/xforms/package/Makefile.in
index 6c310319a48..1c11b1e971e 100755
--- a/mozilla/extensions/xforms/package/Makefile.in
+++ b/mozilla/extensions/xforms/package/Makefile.in
@@ -58,6 +58,9 @@ PACKAGE_FILE = packages-unix
 endif
 endif
 
+GARBAGE		+= xforms.js xforms.template
+GARBAGE_DIRS	+= stage
+
 PACKAGE_VERSION = 0.1
 
 xpi:
diff --git a/mozilla/extensions/xforms/package/xforms.jst b/mozilla/extensions/xforms/package/xforms.jst
index 87c290027de..031da501380 100755
--- a/mozilla/extensions/xforms/package/xforms.jst
+++ b/mozilla/extensions/xforms/package/xforms.jst
@@ -1,4 +1,4 @@
-var err = initInstall("Mozilla XForms", "XForms", "0.1");
+var err = initInstall("Mozilla XForms", "XForms", "$Version$");
 logComment("initInstall: " + err);
 
 var fProgram = getFolder("Program");
@@ -7,9 +7,9 @@ var srComponents = $SpaceRequired$:components;
 
 if (verifyDiskSpace(fProgram, srChrome + srComponents))
 {
-  err = addDirectory("", "0.1", "components", fProgram, "components", true);
+  err = addDirectory("", "$Version$", "components", fProgram, "components", true);
   logComment("addDirectory components: " + err);
-  err = addDirectory("", "0.1", "chrome", fProgram, "chrome", true);
+  err = addDirectory("", "$Version$", "chrome", fProgram, "chrome", true);
   logComment("addDirectory chrome: " + err);
 
   registerChrome(PACKAGE | DELAYED_CHROME, getFolder("Chrome", "xforms.jar"),