diff --git a/.gitignore b/.gitignore
index e9c8487..c178dba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ utils/websockify
 recordings
 *.swp
 *~
+noVNC-*.tgz
diff --git a/.npmignore b/.npmignore
index 725befc..c335c33 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,21 +1,37 @@
-app
-core
-vendor
-.gitmodules
-node_modules
+# infra JS
+/build/
+/node_modules/
+/tests/
+/utils/
+/recordings/
+/vendor/sinon.js
+
+# noVNC application files
+/app
+/vendor/browser-es-module-loader
+/vendor/promise.js
+/vnc.html
+/vnc_lite.html
+
+# raw translation files
+/po
+
+# config files
+/.travis.yml
+/karma.conf.js
+
+# various other files
+/.gitmodules
 .*
 *~
 *.swp
 *.swo
-tests
-.travis.yml
-utils
-docs/notes
-docs/links
-docs/release.txt
-docs/rfb_notes
-docs/*.pdf
-vnc.html
-vnc_lite.html
-karma.conf.js
-docs/flash_policy.txt
+
+# documentation (except licenses)
+/docs/notes
+/docs/links
+/docs/release.txt
+/docs/rfb_notes
+/docs/*.pdf
+/docs/flash_policy.txt
+/CONTRIBUTING.md
diff --git a/package.json b/package.json
index 41f9504..8e62db6 100644
--- a/package.json
+++ b/package.json
@@ -2,14 +2,13 @@
   "name": "noVNC",
   "version": "0.6.1",
   "description": "An HTML5 VNC client",
-  "main": "karma.conf.js",
   "directories": {
     "doc": "docs",
     "test": "tests"
   },
   "scripts": {
     "test": "PATH=$PATH:node_modules/karma/bin karma start karma.conf.js",
-    "prepublish": "node ./utils/use_require.js --as commonjs"
+    "prepare": "node ./utils/use_require.js --as commonjs --clean"
   },
   "repository": {
     "type": "git",