diff --git a/.gitignore b/.gitignore
index 94fceeb2054..6000c6c35a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
+/node_modules/
+/npm-debug.log
 tmp/
-node_modules/
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index efab07fb1bb..00000000000
--- a/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test
-.travis.yml
diff --git a/package.json b/package.json
index aaa4359da58..64e37c41179 100644
--- a/package.json
+++ b/package.json
@@ -1,37 +1,51 @@
 {
   "name": "uglify-js",
   "description": "JavaScript parser, mangler/compressor and beautifier toolkit",
-    "homepage": "http://lisperator.net/uglifyjs",
-    "main": "tools/node.js",
-    "version": "2.4.20",
-    "engines": { "node" : ">=0.4.0" },
-    "maintainers": [{
-        "name": "Mihai Bazon",
-        "email": "mihai.bazon@gmail.com",
-        "web": "http://lisperator.net/"
-    }],
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/mishoo/UglifyJS2.git"
-    },
-    "dependencies": {
-        "async"      : "~0.2.6",
-        "source-map" : "0.1.34",
-        "yargs": "~3.5.4",
-        "uglify-to-browserify": "~1.0.0"
-    },
-    "devDependencies": {
-        "acorn": "~0.6.0",
-        "escodegen": "~1.3.3",
-        "esfuzz": "~0.3.1",
-        "estraverse": "~1.5.1"
-    },
-    "browserify": {
-        "transform": [ "uglify-to-browserify" ]
-    },
-    "bin": {
-        "uglifyjs" : "bin/uglifyjs"
-    },
-    "license": "BSD",
-    "scripts": {"test": "node test/run-tests.js"}
+  "homepage": "http://lisperator.net/uglifyjs",
+  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
+  "license": "BSD",
+  "version": "2.4.20",
+  "engines": {
+    "node": ">=0.4.0"
+  },
+  "maintainers": [
+    "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/mishoo/UglifyJS2.git"
+  },
+  "bugs": {
+    "url": "https://github.com/mishoo/UglifyJS2/issues"
+  },
+  "main": "tools/node.js",
+  "bin": {
+    "uglifyjs": "bin/uglifyjs"
+  },
+  "files": [
+    "bin",
+    "lib",
+    "tools",
+    "LICENSE"
+  ],
+  "dependencies": {
+    "async": "~0.2.6",
+    "source-map": "0.1.34",
+    "uglify-to-browserify": "~1.0.0",
+    "yargs": "~3.5.4"
+  },
+  "devDependencies": {
+    "acorn": "~0.6.0",
+    "escodegen": "~1.3.3",
+    "esfuzz": "~0.3.1",
+    "estraverse": "~1.5.1"
+  },
+  "browserify": {
+    "transform": [
+      "uglify-to-browserify"
+    ]
+  },
+  "scripts": {
+    "test": "node test/run-tests.js"
+  }
 }