diff --git a/Gruntfile.js b/Gruntfile.js
index 711f0934..f59769a2 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -56,16 +56,24 @@ module.exports = function(grunt) {
     },
     browserify: {
       options: {
-        insertGlobalVars: [],
-        debug: true
+        browserifyOptions: {
+          builtins: false,
+          commondir: false
+        },
+        bundleOptions: {
+          detectGlobals: false,
+          ignoreMissing: true,
+          insertGlobalVars: [],
+          debug: true
+        }
       },
       modeler: {
         files: {
-          '<%= config.dist %>/bpmn.js': [ '<%= config.sources %>/**/*.js' ]
+          '<%= config.dist %>/bpmn.js': [ 'shim/*.js', '<%= config.sources %>/**/*.js' ]
         },
         options: {
           alias: [
-            'lodash',
+            'node_modules/lodash:lodash',
             '<%= config.sources %>/main.js:bpmn',
             '<%= config.sources %>/Model.js:bpmn/Model',
             '<%= config.sources %>/Viewer.js:bpmn/Viewer',
@@ -79,7 +87,7 @@ module.exports = function(grunt) {
         },
         options: {
           alias: [
-            'lodash',
+            'node_modules/lodash:lodash',
             '<%= config.sources %>/main.js:bpmn',
             '<%= config.sources %>/Model.js:bpmn/Model',
             '<%= config.sources %>/Viewer.js:bpmn/Viewer'
diff --git a/package.json b/package.json
index 66d850d4..201cbfed 100644
--- a/package.json
+++ b/package.json
@@ -29,18 +29,18 @@
     }
   ],
   "devDependencies": {
-    "grunt": "~0.4.3",
+    "grunt": "^0.4.4",
     "grunt-contrib-watch": "~0.5.0",
     "grunt-contrib-connect": "~0.6.0",
     "grunt-contrib-jshint": "~0.7.2",
     "grunt-contrib-copy": "~0.5.0",
-    "grunt-browserify": "~1.3.0",
+    "grunt-contrib-uglify": "https://github.com/Nikku/grunt-contrib-uglify/archive/v0.4.0-195-fix.tar.gz",
+    "grunt-browserify": "~2.0.0",
     "grunt-jsdoc": "~0.5.1",
     "grunt-concurrent": "~0.4.0",
     "grunt-karma": "~0.8.0",
     "grunt-jasmine-node": "~0.1.0",
     "load-grunt-tasks": "~0.3.0",
-    "uglifyify": "~1.1.0",
     "browserify": ">3.0 && <3.30",
     "karma": "~0.12.0",
     "karma-browserify": "~0.1.0",