diff --git a/cookbooks/ohai/resources/plugin.rb b/cookbooks/ohai/resources/plugin.rb
index d5f1c42fe..7a78a8806 100644
--- a/cookbooks/ohai/resources/plugin.rb
+++ b/cookbooks/ohai/resources/plugin.rb
@@ -29,13 +29,19 @@
     action :nothing
   end
 
-  directory "/etc/chef/ohai" do
+  directory "/etc/chef/ohai/plugins" do
     owner "root"
     group "root"
     mode "755"
     recursive true
   end
 
+  # FIXME: Cleanup of plugins in the old location
+  declare_resource :file, plugin_old_path do
+    action :delete
+    notifies :reload, "ohai[#{new_resource.plugin}]"
+  end
+
   declare_resource :template, plugin_path do
     source new_resource.template
     owner "root"
@@ -52,7 +58,11 @@
 end
 
 action_class do
-  def plugin_path
+  def plugin_old_path
     "/etc/chef/ohai/#{new_resource.plugin}.rb"
   end
+
+  def plugin_path
+    "/etc/chef/ohai/plugins/#{new_resource.plugin}.rb"
+  end
 end