diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index a4e094fa2..6289469ce 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -1,7 +1,7 @@
 #   Copyright (c) 2010-2011, Diaspora Inc.  This file is
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
-require File.join(Rails.root, 'app', 'models', 'acts_as_taggable_on_tag')
+require File.join(Rails.root, 'app', 'models', 'acts_as_taggable_on', 'tag')
 require File.join(Rails.root, 'lib', 'stream', 'tag')
 
 class TagsController < ApplicationController
diff --git a/app/models/acts_as_taggable_on_tag.rb b/app/models/acts_as_taggable_on/tag.rb
similarity index 100%
rename from app/models/acts_as_taggable_on_tag.rb
rename to app/models/acts_as_taggable_on/tag.rb
diff --git a/lib/diaspora/taggable.rb b/lib/diaspora/taggable.rb
index 13c9bb811..b0b9f3d56 100644
--- a/lib/diaspora/taggable.rb
+++ b/lib/diaspora/taggable.rb
@@ -2,6 +2,8 @@
 #   licensed under the Affero General Public License version 3 or later.  See
 #   the COPYRIGHT file.
 
+require File.join(Rails.root, "app", "models", "acts_as_taggable_on", "tag")
+
 module Diaspora
   module Taggable
     def self.included(model)