diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb b/activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb
index 9ccbf71159544638e3ffb9737c21a861cba862dd..34e2276dd12454f4be9c5eee727037431d1dd748 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/oid/date_time.rb
@@ -11,7 +11,8 @@ def cast_value(value)
               when 'infinity' then ::Float::INFINITY
               when '-infinity' then -::Float::INFINITY
               when / BC$/
-                super("-" + value.sub(/ BC$/, ""))
+                astronomical_year = format("%04d", -value[/^\d+/].to_i + 1)
+                super(value.sub(/ BC$/, "").sub(/^\d+/, astronomical_year))
               else
                 super
               end
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index 4c719b834f4546ab14f35c5f45e1ba0c07ac9899..3cf40e6cd46d94e18a5650455c7f614041d9e2f2 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -149,8 +149,9 @@ def quoted_date(value) #:nodoc:
             result = "#{result}.#{sprintf("%06d", value.usec)}"
           end
 
-          if value.year < 0
-            result = result.sub(/^-/, "") + " BC"
+          if value.year <= 0
+            bce_year = format("%04d", -value.year + 1)
+            result = result.sub(/^-?\d+/, bce_year) + " BC"
           end
           result
         end
diff --git a/activerecord/test/cases/adapters/postgresql/timestamp_test.rb b/activerecord/test/cases/adapters/postgresql/timestamp_test.rb
index d4102bf7beba9750c48263a022f43755d916113f..3614b29190952cefd5fdcd2839000ca45bf89e18 100644
--- a/activerecord/test/cases/adapters/postgresql/timestamp_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/timestamp_test.rb
@@ -123,6 +123,18 @@ def test_bc_timestamp
     assert_equal date, Developer.find_by_name("aaron").updated_at
   end
 
+  def test_bc_timestamp_leap_year
+    date = Time.utc(-4, 2, 29)
+    Developer.create!(:name => "taihou", :updated_at => date)
+    assert_equal date, Developer.find_by_name("taihou").updated_at
+  end
+
+  def test_bc_timestamp_year_zero
+    date = Time.utc(0, 4, 7)
+    Developer.create!(:name => "yahagi", :updated_at => date)
+    assert_equal date, Developer.find_by_name("yahagi").updated_at
+  end
+
   private
 
   def pg_datetime_precision(table_name, column_name)