diff --git a/lib/puppet/rails/inventory_node.rb b/lib/puppet/rails/inventory_node.rb
index 52f8621a4..da7e61040 100644
--- a/lib/puppet/rails/inventory_node.rb
+++ b/lib/puppet/rails/inventory_node.rb
@@ -1,25 +1,30 @@
 require 'puppet/rails/inventory_fact'
 
 class Puppet::Rails::InventoryNode < ::ActiveRecord::Base
   has_many :facts, :class_name => "Puppet::Rails::InventoryFact", :foreign_key => :node_id, :dependent => :delete_all
 
+  if Puppet::Util.activerecord_version >= 3.0
+    # Prevents "DEPRECATION WARNING: Base.named_scope has been deprecated, please use Base.scope instead"
+    ActiveRecord::NamedScope::ClassMethods.module_eval { alias :named_scope :scope }
+  end
+
   named_scope :has_fact_with_value, lambda { |name,value|
     {
       :conditions => ["inventory_facts.name = ? AND inventory_facts.value = ?", name, value],
       :joins => :facts
     }
   }
 
   named_scope :has_fact_without_value, lambda { |name,value|
     {
       :conditions => ["inventory_facts.name = ? AND inventory_facts.value != ?", name, value],
       :joins => :facts
     }
   }
 
   def facts_to_hash
     facts.inject({}) do |fact_hash,fact|
       fact_hash.merge(fact.name => fact.value)
     end
   end
 end