diff --git a/.jshintrc b/.jshintrc
index 04ce718..5753443 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -29,6 +29,7 @@
 			"deepEqual",
 			"start",
 			"chrome",
+			"requirejs",
 			"define",
 			"self",
 			"describe",
diff --git a/src/js/app.js b/src/js/app.js
index c1974db..d0ec6ac 100644
--- a/src/js/app.js
+++ b/src/js/app.js
@@ -1,7 +1,7 @@
 // hey Angular, we're bootstrapping manually!
 window.name = 'NG_DEFER_BOOTSTRAP!';
 
-require([
+requirejs([
     'angular',
     'js/controller/dialog',
     'js/controller/popover',
@@ -18,7 +18,21 @@ require([
     'cryptoLib/util',
     'angularRoute',
     'angularTouch'
-], function(angular, DialogCtrl, PopoverCtrl, AddAccountCtrl, AccountCtrl, LoginCtrl, LoginInitialCtrl, LoginNewDeviceCtrl, LoginExistingCtrl, MailListCtrl, ReadCtrl, WriteCtrl, NavigationCtrl, util) {
+], function(
+    angular,
+    DialogCtrl,
+    PopoverCtrl,
+    AddAccountCtrl,
+    AccountCtrl,
+    LoginCtrl,
+    LoginInitialCtrl,
+    LoginNewDeviceCtrl,
+    LoginExistingCtrl,
+    MailListCtrl,
+    ReadCtrl,
+    WriteCtrl,
+    NavigationCtrl,
+    util) {
     'use strict';
 
     // reset window.name
diff --git a/src/require-config.js b/src/require-config.js
index 4107ffb..ea5e10f 100644
--- a/src/require-config.js
+++ b/src/require-config.js
@@ -1,7 +1,8 @@
 (function() {
 	'use strict';
 
-	require.config({
+	requirejs.config({
+		nodeRequire: (typeof module !== 'undefined' && module.exports) ? require : undefined,
 		baseUrl: 'lib',
 		paths: {
 			js: '../js',