diff --git a/.gitignore b/.gitignore
index f5e5f3d209..7d7c484c85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ projectFilesBackup
 
 # Ghost DB file
 *.db
+*.db-journal
 
 .build
 .dist
diff --git a/Gruntfile.js b/Gruntfile.js
index 045984af2e..9bcfff4857 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -9,6 +9,22 @@ var path = require('path'),
     distDirectory =  path.resolve(process.cwd(), '.dist'),
     configLoader = require('./core/config-loader.js'),
 
+    buildGlob = [
+        '**',
+        '!docs/**',
+        '!node_modules/**',
+        '!content/images/**',
+        '!**/*.db*',
+        '!*.db*',
+        '!.sass*',
+        '!.af*',
+        '!.git*',
+        '!.groc*',
+        '!*.iml',
+        '!config.js',
+        '!.travis.yml'
+    ],
+
     configureGrunt = function (grunt) {
 
         // load all grunt tasks
@@ -267,49 +283,21 @@ var path = require('path'),
                 nightly: {
                     files: [{
                         expand: true,
-                        src: [
-                            '**',
-                            '!node_modules/**',
-                            '!core/server/data/*.db',
-                            '!.sass*',
-                            '!.af*',
-                            '!.git*',
-                            '!.groc*',
-                            '!.travis.yml'
-                        ],
+                        src: buildGlob,
                         dest: "<%= paths.nightlyBuild %>/<%= pkg.version %>/"
                     }]
                 },
                 weekly: {
                     files: [{
                         expand: true,
-                        src: [
-                            '**',
-                            '!node_modules/**',
-                            '!core/server/data/*.db',
-                            '!.sass*',
-                            '!.af*',
-                            '!.git*',
-                            '!.groc*',
-                            '!.travis.yml'
-                        ],
+                        src: buildGlob,
                         dest: "<%= paths.weeklyBuild %>/<%= pkg.version %>/"
                     }]
                 },
                 build: {
                     files: [{
                         expand: true,
-                        src: [
-                            '**',
-                            '!node_modules/**',
-                            '!core/server/data/*.db',
-                            '!.sass*',
-                            '!.af*',
-                            '!.git*',
-                            '!.groc*',
-                            '!.iml*',
-                            '!.travis.yml'
-                        ],
+                        src: buildGlob,
                         dest: "<%= paths.buildBuild %>/"
                     }]
                 }