diff --git a/lib/puppet/node/facts.rb b/lib/puppet/node/facts.rb
index b77ad22d5..ad4b91e98 100755
--- a/lib/puppet/node/facts.rb
+++ b/lib/puppet/node/facts.rb
@@ -1,70 +1,91 @@
+require 'time'
+
 require 'puppet/node'
 require 'puppet/indirector'
 
+require 'puppet/util/pson'
+
 # Manage a given node's facts.  This either accepts facts and stores them, or
 # returns facts for a given node.
 class Puppet::Node::Facts
   # Set up indirection, so that nodes can be looked for in
   # the node sources.
   extend Puppet::Indirector
+  extend Puppet::Util::Pson
 
   # We want to expire any cached nodes if the facts are saved.
   module NodeExpirer
     def save(key, instance)
       Puppet::Node.expire(instance.name)
       super
     end
   end
 
   indirects :facts, :terminus_setting => :facts_terminus, :extend => NodeExpirer
 
   attr_accessor :name, :values
 
   def add_local_facts
     values["clientcert"] = Puppet.settings[:certname]
     values["clientversion"] = Puppet.version.to_s
     values["environment"] ||= Puppet.settings[:environment]
   end
 
   def initialize(name, values = {})
     @name = name
     @values = values
 
     add_internal
   end
 
   def downcase_if_necessary
     return unless Puppet.settings[:downcasefacts]
 
     Puppet.warning "DEPRECATION NOTICE: Fact downcasing is deprecated; please disable (20080122)"
     values.each do |fact, value|
       values[fact] = value.downcase if value.is_a?(String)
     end
   end
 
   # Convert all fact values into strings.
   def stringify
     values.each do |fact, value|
       values[fact] = value.to_s
     end
   end
 
   def ==(other)
     return false unless self.name == other.name
     strip_internal == other.send(:strip_internal)
   end
 
+  def self.from_pson(data)
+    result = new(data['name'], data['values'])
+    result.values[:_timestamp] = Time.parse(data['timestamp'])
+    result.expiration = Time.parse(data['expiration'])
+    result
+  end
+
+  def to_pson(*args)
+    {
+      'expiration' => expiration,
+      'name' => name,
+      'timestamp' => values[:_timestamp],
+      'values' => values.reject {|k,v| k == :_timestamp},
+    }.to_pson(*args)
+  end
+
   private
 
   # Add internal data to the facts for storage.
   def add_internal
     self.values[:_timestamp] = Time.now
   end
 
   # Strip out that internal data.
   def strip_internal
     newvals = values.dup
     newvals.find_all { |name, value| name.to_s =~ /^_/ }.each { |name, value| newvals.delete(name) }
     newvals
   end
 end
diff --git a/spec/unit/node/facts_spec.rb b/spec/unit/node/facts_spec.rb
index 394db7913..19049e9bf 100755
--- a/spec/unit/node/facts_spec.rb
+++ b/spec/unit/node/facts_spec.rb
@@ -1,113 +1,137 @@
 #!/usr/bin/env ruby
 
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 require 'puppet/node/facts'
 
 describe Puppet::Node::Facts, "when indirecting" do
   before do
     @facts = Puppet::Node::Facts.new("me")
   end
 
   it "should be able to convert all fact values to strings" do
     @facts.values["one"] = 1
     @facts.stringify
     @facts.values["one"].should == "1"
   end
 
   it "should add the node's certificate name as the 'clientcert' fact when adding local facts" do
     @facts.add_local_facts
     @facts.values["clientcert"].should == Puppet.settings[:certname]
   end
 
   it "should add the Puppet version as a 'clientversion' fact when adding local facts" do
     @facts.add_local_facts
     @facts.values["clientversion"].should == Puppet.version.to_s
   end
 
   it "should add the current environment as a fact if one is not set when adding local facts" do
     @facts.add_local_facts
     @facts.values["environment"].should == Puppet[:environment]
   end
 
   it "should not replace any existing environment fact when adding local facts" do
     @facts.values["environment"] = "foo"
     @facts.add_local_facts
     @facts.values["environment"].should == "foo"
   end
 
   it "should be able to downcase fact values" do
     Puppet.settings.stubs(:value).returns "eh"
     Puppet.settings.expects(:value).with(:downcasefacts).returns true
 
     @facts.values["one"] = "Two"
 
     @facts.downcase_if_necessary
     @facts.values["one"].should == "two"
   end
 
   it "should only try to downcase strings" do
     Puppet.settings.stubs(:value).returns "eh"
     Puppet.settings.expects(:value).with(:downcasefacts).returns true
 
     @facts.values["now"] = Time.now
 
     @facts.downcase_if_necessary
     @facts.values["now"].should be_instance_of(Time)
   end
 
   it "should not downcase facts if not configured to do so" do
     Puppet.settings.stubs(:value).returns "eh"
     Puppet.settings.expects(:value).with(:downcasefacts).returns false
 
     @facts.values["one"] = "Two"
     @facts.downcase_if_necessary
     @facts.values["one"].should == "Two"
   end
 
   describe "when indirecting" do
     before do
       @indirection = stub 'indirection', :request => mock('request'), :name => :facts
 
       # We have to clear the cache so that the facts ask for our indirection stub,
       # instead of anything that might be cached.
       Puppet::Util::Cacher.expire
 
       @facts = Puppet::Node::Facts.new("me", "one" => "two")
     end
 
     it "should redirect to the specified fact store for retrieval" do
       Puppet::Node::Facts.stubs(:indirection).returns(@indirection)
       @indirection.expects(:find)
       Puppet::Node::Facts.find(:my_facts)
     end
 
     it "should redirect to the specified fact store for storage" do
       Puppet::Node::Facts.stubs(:indirection).returns(@indirection)
       @indirection.expects(:save)
       @facts.save
     end
 
     describe "when the Puppet application is 'master'" do
       it "should default to the 'yaml' terminus" do
         pending "Cannot test the behavior of defaults in defaults.rb"
         # Puppet::Node::Facts.indirection.terminus_class.should == :yaml
       end
     end
 
     describe "when the Puppet application is not 'master'" do
       it "should default to the 'facter' terminus" do
         pending "Cannot test the behavior of defaults in defaults.rb"
         # Puppet::Node::Facts.indirection.terminus_class.should == :facter
       end
     end
 
   end
 
   describe "when storing and retrieving" do
     it "should add metadata to the facts" do
       facts = Puppet::Node::Facts.new("me", "one" => "two", "three" => "four")
       facts.values[:_timestamp].should be_instance_of(Time)
     end
+
+    describe "using pson" do
+      before :each do
+        @timestamp = Time.parse("Thu Oct 28 11:16:31 -0700 2010")
+        @expiration = Time.parse("Thu Oct 28 11:21:31 -0700 2010")
+      end
+
+      it "should accept properly formatted pson" do
+        pson = %Q({"name": "foo", "expiration": "#{@expiration}", "timestamp": "#{@timestamp}", "values": {"a": "1", "b": "2", "c": "3"}})
+        format = Puppet::Network::FormatHandler.format('pson')
+        facts = format.intern(Puppet::Node::Facts,pson)
+        facts.name.should == 'foo'
+        facts.expiration.should == @expiration
+        facts.values.should == {'a' => '1', 'b' => '2', 'c' => '3', :_timestamp => @timestamp}
+      end
+
+      it "should generate properly formatted pson" do
+        Time.stubs(:now).returns(@timestamp)
+        facts = Puppet::Node::Facts.new("foo", {'a' => 1, 'b' => 2, 'c' => 3})
+        facts.expiration = @expiration
+        pson = PSON.parse(facts.to_pson)
+        pson.should == {"name"=>"foo", "timestamp"=>"Thu Oct 28 11:16:31 -0700 2010", "expiration"=>"Thu Oct 28 11:21:31 -0700 2010", "values"=>{"a"=>1, "b"=>2, "c"=>3}}
+      end
+    end
   end
 end