diff --git a/.gitignore b/.gitignore
index 42797bcb9b2d7df8dbf3f8e3cbed564557f86eaa..0fe56c31c801d86852a152dfb24f45c0720819a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,9 +25,6 @@ __pycache__
 parser.out
 parsetab.py
 
-# Package generation metadata for Grunt
-/meta.json
-
 # Local NodeJS modules for Grunt
 /node_modules/
 
diff --git a/Gruntfile.js b/Gruntfile.js
index 4d7491d73697527c4d5ec4ecc67754f7e0325d92..18388e673ff3c9e8b485a86bd580cad8752808b1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -21,7 +21,7 @@ module.exports = function(grunt) {
     grunt.initConfig({
 
         pkg:  grunt.file.readJSON('package.json'),
-        meta: grunt.file.readJSON('meta.json'),
+        meta: grunt.file.readJSON('gruntconf.json'),
 
         // Project paths to important directories.
         project_paths: {
@@ -47,6 +47,12 @@ module.exports = function(grunt) {
                 src: [
                     "<%= project_paths.package_dir %>"
                 ]
+            },
+            // Remove separate subprojects from build subdirectory
+            subprojects: {
+                src: [
+                    "<%= project_paths.package_dir %>usr/lib/python3/dist-packages/pynspect"
+                ]
             }
         },
 
@@ -243,7 +249,7 @@ module.exports = function(grunt) {
             grunt.log.error(e);
             grunt.fail.warn("Error parsing the JSON data.", 3);
         }
-        grunt.file.write('meta.json', JSON.stringify(obj, null, 4));
+        grunt.file.write('gruntconf.json', JSON.stringify(obj, null, 4));
     });
 
     // ---------------------------------------------------------------------
@@ -252,7 +258,11 @@ module.exports = function(grunt) {
 
     grunt.registerTask('deb-build',
                        '(RUN) Build Debian packages for Mentat-ng system.',
-                       ['clean:build', 'shell:deb_archive', 'copy:deb', 'chmod', 'shell:dir_size', 'inc-version', 'save-meta', 'template:deb-control', 'shell:deb_build', 'clean:build', 'shell:deb_duplicate']
+                       ['clean:build', 'shell:deb_archive', 'copy:deb', 'clean:subprojects', 'chmod', 'shell:dir_size', 'inc-version', 'save-meta', 'template:deb-control', 'shell:deb_build', 'clean:build', 'shell:deb_duplicate']
+        );
+    grunt.registerTask('deb-buildbot',
+                       '(RUN) Build Debian packages for Mentat-ng system by Buildbot automation system.',
+                       ['clean:build', 'shell:deb_archive', 'copy:deb', 'clean:subprojects', 'chmod', 'shell:dir_size', 'template:deb-control', 'shell:deb_build', 'clean:build', 'shell:deb_duplicate']
         );
     grunt.registerTask('deb-scp-upload',
                        '(RUN) Upload latest Debian packages to repository server, development server and demo server.',
diff --git a/deploy/mentat/ctrl/control.tmpl b/deploy/mentat/ctrl/control.tmpl
index 6b32113adfdf0880f14e90e0a065cf23a42bd4cc..94e4f686b127673bce60731d67ad036af91ff106 100644
--- a/deploy/mentat/ctrl/control.tmpl
+++ b/deploy/mentat/ctrl/control.tmpl
@@ -5,8 +5,6 @@ Installed-Size: <%- package_size %>
 Priority: optional
 Architecture: <%- architecture %>
 Depends: python3, python3-jinja2, python3-ply
-Conflicts: mentat-utils
-Replaces: mentat-utils
 Maintainer: Jan Mach <jan.mach@cesnet.cz>
 Description: mentat-ng
  Next generation of Mentat system written in Python3.
diff --git a/gruntconf.json b/gruntconf.json
new file mode 100644
index 0000000000000000000000000000000000000000..83b8022ae7b040e163ffc31a9532c7fe0482d809
--- /dev/null
+++ b/gruntconf.json
@@ -0,0 +1,13 @@
+{
+    "name": "mentat-ng",
+    "version_minor": 82,
+    "version_major": "0.2",
+    "architecture": "all",
+    "pkg_server": "homeproj",
+    "pkg_location": "/var/reps/apt/certs/incoming",
+    "dev_server": "mentat-dev",
+    "dev_location": "/root",
+    "demo_server": "mentat-demo",
+    "demo_location": "/root",
+    "dep_server": "mentat-hub"
+}
diff --git a/package.json b/package.json
index dff4cf5c47c563e5c9620ca2d5c96ad30282c1e3..2daeb2f8fbc1ef1bc9d27909b8c517ffcb03f634 100644
--- a/package.json
+++ b/package.json
@@ -1,18 +1,26 @@
 {
-  "name": "mentat-ng",
-  "version": "0.2.0",
-  "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-contrib-clean": "~0.6.0",
-    "grunt-contrib-concat": "~0.5.1",
-    "grunt-contrib-copy": "~0.8.0",
-    "grunt-contrib-rename": "0.0.3",
-    "grunt-ftp-deploy": "~0.1.10",
-    "grunt-shell": "~1.1.2",
-    "load-grunt-tasks": "~3.2.0",
-    "npm-shrinkwrap": "~5.4.0",
-    "time-grunt": "~1.2.1",
-    "grunt-template": "~0.2.3",
-    "grunt-chmod": "~1.1.1"
-  }
+    "name": "mentat-ng",
+    "version": "2.0.0",
+    "description": "Distributed modular SIEM system designed to monitor networks of all sizes",
+    "author": "CESNET-CERTS Development Team (https://csirt.cesnet.cz/en/contact)",
+    "homepage": "https://mentat.cesnet.cz/en/index",
+    "repository": {
+        "type": "git",
+        "url": "https://homeproj.cesnet.cz/git/mentat.git"
+    },
+    "license": "MIT",
+    "devDependencies": {
+        "grunt": "~0.4.5",
+        "grunt-contrib-clean": "~0.6.0",
+        "grunt-contrib-concat": "~0.5.1",
+        "grunt-contrib-copy": "~0.8.0",
+        "grunt-contrib-rename": "0.0.3",
+        "grunt-ftp-deploy": "~0.1.10",
+        "grunt-shell": "~1.1.2",
+        "load-grunt-tasks": "~3.2.0",
+        "npm-shrinkwrap": "~5.4.0",
+        "time-grunt": "~1.2.1",
+        "grunt-template": "~0.2.3",
+        "grunt-chmod": "~1.1.1"
+    }
 }