diff --git a/app/controllers/admin/plugins_controller.rb b/app/controllers/admin/plugins_controller.rb
index 883977e..d68a053 100644
--- a/app/controllers/admin/plugins_controller.rb
+++ b/app/controllers/admin/plugins_controller.rb
@@ -1,7 +1,7 @@
 class PluginsController < AdminController
 
   def index
-    @active_plugins = Noosfero::Plugin.all.map {|plugin_name| eval(plugin_name)}.compact
+    @active_plugins = Noosfero::Plugin.all.map {|plugin_name| plugin_name.constantize }.compact
   end
 
   post_only :update
diff --git a/lib/noosfero/plugin/manager.rb b/lib/noosfero/plugin/manager.rb
index 142e460..e57631c 100644
--- a/lib/noosfero/plugin/manager.rb
+++ b/lib/noosfero/plugin/manager.rb
@@ -12,7 +12,7 @@ class Noosfero::Plugin::Manager
 
   def enabled_plugins
     @enabled_plugins ||= (Noosfero::Plugin.all & context.environment.enabled_plugins).map do |plugin|
-      p = eval(plugin).new
+      p = plugin.constantize.new
       p.context = context
       p
     end
--
libgit2 0.21.2