2 files changed, 12 insertions, 0 deletions
diff --git a/lib/puppet/resource.rb b/lib/puppet/resource.rb
index b8347f8d7..add32b7cf 100644
--- a/lib/puppet/resource.rb
+++ b/lib/puppet/resource.rb
@@ -29,6 +29,16 @@ class Puppet::Resource
         @parameters[parameter_name(param)]
     end
 
+    # Compatibility method.
+    def builtin?
+        builtin_type?
+    end
+
+    # Is this a builtin resource type?
+    def builtin_type?
+        @reference.builtin_type?
+    end
+
     # Iterate over each param/value pair, as required for Enumerable.
     def each
         @parameters.each { |p,v| yield p, v }
diff --git a/lib/puppet/resource/catalog.rb b/lib/puppet/resource/catalog.rb
index d50241d6c..78f6a6f79 100644
--- a/lib/puppet/resource/catalog.rb
+++ b/lib/puppet/resource/catalog.rb
@@ -469,6 +469,8 @@ class Puppet::Resource::Catalog < Puppet::SimpleGraph
     def to_catalog(convert)
         result = self.class.new(self.name)
 
+        result.version = self.version
+
         map = {}
         vertices.each do |resource|
             next if resource.respond_to?(:virtual?) and resource.virtual?