diff --git a/ChangeLog b/ChangeLog
index 6ab1afed51..566e03f023 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Sun Dec 18 12:42:48 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: BigDecimals can be restored
+	  from YAML.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: BigDecimals can be dumped
+	  to YAML.
+	* test/psych/test_numeric.rb: tests for BigDecimal serialization
+
 Sun Dec 18 12:03:13 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/scalar_scanner.rb: Strings that look like dates
diff --git a/ext/psych/lib/psych/visitors/to_ruby.rb b/ext/psych/lib/psych/visitors/to_ruby.rb
index 4267f4d004..bf48f9d029 100644
--- a/ext/psych/lib/psych/visitors/to_ruby.rb
+++ b/ext/psych/lib/psych/visitors/to_ruby.rb
@@ -52,6 +52,9 @@ module Psych
           o.value.unpack('m').first
         when '!str', 'tag:yaml.org,2002:str'
           o.value
+        when '!ruby/object:BigDecimal'
+          require 'bigdecimal'
+          BigDecimal._load o.value
         when "!ruby/object:DateTime"
           require 'date'
           @ss.parse_time(o.value).to_datetime
diff --git a/ext/psych/lib/psych/visitors/yaml_tree.rb b/ext/psych/lib/psych/visitors/yaml_tree.rb
index 523ad77645..f37396602c 100644
--- a/ext/psych/lib/psych/visitors/yaml_tree.rb
+++ b/ext/psych/lib/psych/visitors/yaml_tree.rb
@@ -214,6 +214,10 @@ module Psych
         end
       end
 
+      def visit_BigDecimal o
+        @emitter.scalar o._dump, nil, '!ruby/object:BigDecimal', false, false, Nodes::Scalar::ANY
+      end
+
       def binary? string
         string.encoding == Encoding::ASCII_8BIT ||
           string.index("\x00") ||
diff --git a/test/psych/test_numeric.rb b/test/psych/test_numeric.rb
index 9adb058a32..bae723aca9 100644
--- a/test/psych/test_numeric.rb
+++ b/test/psych/test_numeric.rb
@@ -1,4 +1,5 @@
 require 'psych/helper'
+require 'bigdecimal'
 
 module Psych
   ###
@@ -10,5 +11,15 @@ module Psych
       str = Psych.load('--- 090')
       assert_equal '090', str
     end
+
+    def test_big_decimal_tag
+      decimal = BigDecimal("12.34")
+      assert_match "!ruby/object:BigDecimal", Psych.dump(decimal)
+    end
+
+    def test_big_decimal_round_trip
+      decimal = BigDecimal("12.34")
+      assert_cycle decimal
+    end
   end
 end