diff --git a/package.json b/package.json
index a9d1ae0..2f04055 100644
--- a/package.json
+++ b/package.json
@@ -77,6 +77,7 @@
     "emojify.js": "^0.9.5",
     "express": "^4.0.0",
     "express-handlebars": "^1.1.0",
+    "express-routebuilder": "^2.0.0",
     "grunt-contrib-handlebars": "^0.9.1",
     "handlebars": "^2.0.0",
     "jquery": "^2.1.0",
diff --git a/server/app.js b/server/app.js
index b2afc90..d08d84b 100644
--- a/server/app.js
+++ b/server/app.js
@@ -1,7 +1,7 @@
 // Load dependencies
 const path = require('path');
 const express = require('express');
-const routeBuilder = require('./helpers/route-builder');
+const routeBuilder = require('express-routebuilder');
 const exphbs = require('express-handlebars');
 const bodyParser = require('body-parser');
 
@@ -72,7 +72,9 @@ var routes = {
   }
 };
 
-app.use(routeBuilder(express, routes));
+var router = express.Router();
+routeBuilder(router, routes);
+app.use(router);
 
 // Start the app
 app.listen(PORT);
diff --git a/server/helpers/route-builder.js b/server/helpers/route-builder.js
deleted file mode 100644
index 1accc83..0000000
--- a/server/helpers/route-builder.js
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-// routeBuilder
-// Specify Express routes declaratively
-//
-
-module.exports = function (express, routes) {
-  var router = express.Router();
-  Object.keys(routes).forEach(function (verb) {
-     var endpoints = routes[verb];
-     Object.keys(endpoints).forEach(function (endpoint) {
-       router[verb].call(router, endpoint, endpoints[endpoint]);
-     });
-  });
-  return router;
-};