diff --git a/CHANGES.current b/CHANGES.current
index d24f6c312..e4022a642 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -5,6 +5,10 @@ See the RELEASENOTES file for a summary of changes in each release.
 Version 2.0.1 (in progress)
 ===========================
 
+2010-08-17: wsfulton
+            [Perl] Fix corner case marshalling of doubles - errno was not being correctly
+            set before calling strtod - patch from Justin Vallon.
+
 2010-08-17: wsfulton
             Fix make distclean when some of the more obscure languages are detected by
             configure - fixes from Torsten Landschoff.
diff --git a/Lib/perl5/perlprimtypes.swg b/Lib/perl5/perlprimtypes.swg
index ae7bb3886..f2a614030 100644
--- a/Lib/perl5/perlprimtypes.swg
+++ b/Lib/perl5/perlprimtypes.swg
@@ -311,6 +311,7 @@ SWIG_AsVal_dec(double)(SV *obj, double *val)
     const char *nptr = SvPV_nolen(obj);
     if (nptr) {
       char *endptr;
+      errno = 0;
       double v = strtod(nptr, &endptr);
       if (errno == ERANGE) {
 	errno = 0;