diff --git a/.gitignore b/.gitignore
index efbdc824d29289..33e03ba7f2c30b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,10 @@
 # Whitelist dotfiles
 .*
-!deps/**/.*
-!test/fixtures/**/.*
-!tools/eslint/**/.*
-!tools/doc/node_modules/**/.*
+!deps/**
 !.editorconfig
 !.eslintignore
 !.eslintrc.yaml
+!.eslintrc.yml
 !.gitattributes
 !.github
 !.gitignore
@@ -24,9 +22,8 @@ perf.data.old
 tags
 .lock-wscript
 *.pyc
-doc/api.xml
+/doc/api.xml
 tmp/
-test/tmp*/
 iojs
 iojs_g
 node
@@ -36,16 +33,13 @@ node_g
 icu_config.gypi
 .eslintcache
 node_trace.*.log
-coverage/
-
+/coverage/
 /out
+*.tap
 
 # various stuff that VC++ produces/uses
 Debug/
-!**/node_modules/debug/
-!deps/v8/src/debug/
 Release/
-!doc/blog/**
 *.sln
 !nodemsi.sln
 *.suo
@@ -62,41 +56,24 @@ ipch/
 *.VC.opendb
 .vs/
 .vscode/
-/deps/v8/src/debug/obj
 /*.exe
 
-/config.mk
-/config.gypi
-/config_fips.gypi
+config.mk
+config.gypi
+config_fips.gypi
+icu_config.gypi
 *-nodegyp*
 /gyp-mac-tool
 /npm.wxs
 /tools/msvs/npm.wixobj
 /tools/msvs/genfiles/
-/test/addons/??_*/
 email.md
-deps/v8-*
-deps/icu
-deps/icu*.zip
-deps/icu*.tgz
-deps/icu-tmp
-./node_modules
 android-toolchain/
 .svn/
+*.target.mk
+*.host.mk
 
-# generated by gyp on Windows
-deps/openssl/openssl.props
-deps/openssl/openssl.targets
-deps/openssl/openssl.xml
-
-# generated by gyp on android
-/*.target.mk
-/*.host.mk
-deps/openssl/openssl.target.mk
-deps/zlib/zlib.target.mk
-
-# not needed and causes issues for distro packagers
-deps/npm/node_modules/.bin/
+!doc/blog/**
 
 # build/release artifacts
 /*.tar.*
@@ -104,17 +81,18 @@ deps/npm/node_modules/.bin/
 /SHASUMS*.txt*
 
 # test artifacts
-tools/faketime
-tools/remark-cli/node_modules
-tools/remark-preset-lint-node/node_modules
-icu_config.gypi
-*.tap
+/tools/faketime
+/test/addons/??_*/
 
 # Xcode workspaces and project folders
 *.xcodeproj
 *.xcworkspace
 
-# libuv book and GitHub template
-deps/uv/.github/
-deps/uv/docs/code/
-deps/uv/docs/src/guide/
+# npm stuff
+node_modules
+package-lock.json
+!/tools/eslint/node_modules**
+!/tools/doc/node_modules**
+!/test/fixtures/**
+
+# more patterns in /deps/.gitignore
\ No newline at end of file
diff --git a/deps/.gitignore b/deps/.gitignore
new file mode 100644
index 00000000000000..a73be45b710f2b
--- /dev/null
+++ b/deps/.gitignore
@@ -0,0 +1,29 @@
+!/v8/test/debugger/debug/
+!/v8/src/base/debug
+!/v8/src/debug
+/v8/src/debug/obj
+
+!/v8/tools/release
+
+/v8-*
+/icu
+/icu*.zip
+/icu*.tgz
+/icu-tmp
+
+# generated by gyp on Windows
+/openssl/openssl.props
+/openssl/openssl.targets
+/openssl/openssl.xml
+
+!/npm/node_modules**
+/npm/node_modules/node-gyp/gyp/**/*.pyc
+# not needed and causes issues for distro packagers
+/npm/node_modules/.bin/
+
+# libuv book and GitHub template
+/uv/.github/
+/uv/docs/code/
+/uv/docs/src/guide/
+
+!/v8/test/**log