diff --git a/Brocfile.js b/Brocfile.js
index 6aad131..f760b1c 100644
--- a/Brocfile.js
+++ b/Brocfile.js
@@ -58,8 +58,6 @@ app.import({
   production: 'bower_components/webshim/js-webshim/minified/polyfiller.js'
 });
 
-app.import('bower_components/ember-validations/index.js');
-
 app.import('bower_components/sjcl/sjcl.js');
 
 app.import('bower_components/modernizr/modernizr.js');
diff --git a/app/controllers/create/index.js b/app/controllers/create/index.js
index ae83a0b..7ee740f 100644
--- a/app/controllers/create/index.js
+++ b/app/controllers/create/index.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function() {
       // redirect to CreateMeta
diff --git a/app/controllers/create/meta.js b/app/controllers/create/meta.js
index 05ddf72..8d26405 100644
--- a/app/controllers/create/meta.js
+++ b/app/controllers/create/meta.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function() {
       // redirect to CreateOptions
diff --git a/app/controllers/create/options-datetime.js b/app/controllers/create/options-datetime.js
index 6991d04..4e14041 100644
--- a/app/controllers/create/options-datetime.js
+++ b/app/controllers/create/options-datetime.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     /*
      * copy first line
diff --git a/app/controllers/create/options.js b/app/controllers/create/options.js
index ac2d04e..f9bf138 100644
--- a/app/controllers/create/options.js
+++ b/app/controllers/create/options.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function(){
       var pollType = this.get('pollType');
diff --git a/app/controllers/create/settings.js b/app/controllers/create/settings.js
index 12e96f7..be8304c 100644
--- a/app/controllers/create/settings.js
+++ b/app/controllers/create/settings.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
   actions: {
     save: function(){
       // check if answer type is selected
diff --git a/app/controllers/poll.js b/app/controllers/poll.js
index befd904..88d759f 100644
--- a/app/controllers/poll.js
+++ b/app/controllers/poll.js
@@ -1,6 +1,7 @@
 import Ember from "ember";
+import EmberValidations from 'ember-validations';
 
-export default Ember.ObjectController.extend(Ember.Validations.Mixin, {
+export default Ember.ObjectController.extend(EmberValidations.Mixin, {
     encryptionKey: '',
     newUserName: '',
     queryParams: ['encryptionKey'],
diff --git a/bower.json b/bower.json
index fde744d..4350872 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,6 @@
     "ember-qunit": "0.1.8",
     "ember-qunit-notifications": "0.0.4",
     "qunit": "~1.15.0",
-    "ember-validations": "http://builds.dockyard.com.s3.amazonaws.com/ember-validations/tags/v1.0.0/ember-validations.js",
     "ember-easyForm": "http://builds.dockyard.com/ember-easyForm/latest/ember-easyForm.js",
     "ember-i18n": "~2.9.0",
     "sjcl": "~1.0.0",
diff --git a/package.json b/package.json
index 82c9908..d129b4a 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
     "express": "^4.8.5",
     "glob": "^4.0.5",
     "broccoli-static-compiler": "~0.2.1",
-    "ember-cli-less": "~1.0.4"
+    "ember-cli-less": "~1.0.4",
+    "ember-validations": "~2.0.0"
   }
 }