diff --git a/Gemfile b/Gemfile
index 0a2b2fe9..2b6e2a8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -25,5 +25,5 @@ group :test do
   gem "cucumber", "~> 0.3.101", :require => false
   gem 'webrat', '>= 0.4.3', :require => false
   gem 'machinist', '>= 1.0.3'
-  gem 'faker'
+  gem 'ffaker'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 0071d9bf..5d7dd8b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,12 +28,10 @@ GEM
       term-ansicolor (>= 1.0.3)
       treetop (>= 1.4.2)
     diff-lcs (1.1.3)
-    faker (0.9.5)
-      i18n (~> 0.4)
     fast_gettext (0.4.17)
+    ffaker (1.8.1)
     gettext (2.0.0)
     haml (3.0.25)
-    i18n (0.6.0)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
     machinist (1.0.6)
@@ -84,8 +82,8 @@ DEPENDENCIES
   autotest
   autotest-rails
   cucumber (~> 0.3.101)
-  faker
   fast_gettext
+  ffaker
   gettext (>= 1.9.3)
   haml
   machinist (>= 1.0.3)
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 5441b7fa..799235b8 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -29,4 +29,4 @@
 
 # For Machinist...
 config.gem 'machinist', :version => ">=1.0.3"
-config.gem 'faker'
\ No newline at end of file
+config.gem 'ffaker'
\ No newline at end of file
diff --git a/spec/blueprints.rb b/spec/blueprints.rb
index dc68461e..e377b47d 100644
--- a/spec/blueprints.rb
+++ b/spec/blueprints.rb
@@ -1,7 +1,7 @@
 # Object blueprints for Machinist.
 require 'machinist/active_record'
 require 'sham'
-require 'faker'
+require 'ffaker'
 LETTERS = ('A'..'Z').to_a
 
 Event.blueprint do
diff --git a/vendor/plugins/acts_as_addressed/spec/blueprints.rb b/vendor/plugins/acts_as_addressed/spec/blueprints.rb
index 63aa0301..1538c67c 100644
--- a/vendor/plugins/acts_as_addressed/spec/blueprints.rb
+++ b/vendor/plugins/acts_as_addressed/spec/blueprints.rb
@@ -1,7 +1,7 @@
 # Object blueprints for Machinist.
 require 'machinist/active_record'
 require 'sham'
-require 'faker'
+require 'ffaker'
 LETTERS = ('A'..'Z').to_a
 
 module Acts::Addressed