diff --git a/.gitignore b/.gitignore
index e63c757..a5de673 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,28 @@
 *~
-*.js
 lib/*.map
+lib/api-functions.js
+lib/auth.js
+lib/cache.js
+lib/common.js
+lib/config.js
+lib/cwmp.js
+lib/db.js
+lib/fs.js
+lib/nbi.js
+lib/query.js
+lib/server.js
+lib/session.js
 node_modules
-debug/*
+debug
+config/auth.js
+config/config.json
+config/cwmp.key
+config/cwmp.crt
+config/cwmp.ca-bundle
+config/nbi.key
+config/nbi.crt
+config/nbi.ca-bundle
+config/fs.key
+config/fs.crt
+config/fs.ca-bundle
+config/ext
diff --git a/.npmignore b/.npmignore
index 28a805c..65aec85 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1,14 +1,21 @@
 *~
 .npmignore
 
-config/*
-!config/*-sample.*
-!config/custom_commands
+config/auth.js
+config/config.json
+config/cwmp.key
+config/cwmp.crt
+config/cwmp.ca-bundle
+config/nbi.key
+config/nbi.crt
+config/nbi.ca-bundle
+config/fs.key
+config/fs.crt
+config/fs.ca-bundle
+config/ext
 
 debug/*
 !debug/.gitkeep
 
 lib/*.coffee
-tools/*.coffee
-test/*.coffee
-
+lib/*.map