diff --git a/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs b/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs
index a27a50ca54..31ea76a3cb 100755
--- a/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs
+++ b/src/Npgsql/NpgsqlTypes/NpgsqlDateTime.cs
@@ -179,7 +179,7 @@ public NpgsqlDateTime ToUniversalTime()
             case InternalType.FiniteUnspecified:
                 // Treat as Local
             case InternalType.FiniteLocal:
-                return new NpgsqlDateTime(Subtract(TimeZoneInfo.Local.BaseUtcOffset).Ticks, DateTimeKind.Utc);
+                return new NpgsqlDateTime(this.DateTime.ToUniversalTime());
             case InternalType.FiniteUtc:
             case InternalType.Infinity:
             case InternalType.NegativeInfinity:
@@ -195,7 +195,7 @@ public NpgsqlDateTime ToLocalTime()
             case InternalType.FiniteUnspecified:
                 // Treat as UTC
             case InternalType.FiniteUtc:
-                return new NpgsqlDateTime(Add(TimeZoneInfo.Local.BaseUtcOffset).Ticks, DateTimeKind.Local);
+                return new NpgsqlDateTime(this.DateTime.ToLocalTime());
             case InternalType.FiniteLocal:
             case InternalType.Infinity:
             case InternalType.NegativeInfinity: