diff --git a/ChangeLog b/ChangeLog
index b28e913c4..2f5c32e36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,8 +120,8 @@
    Clarke).
  + Fixed bug #788, which reported regex and readline versions, even though they
    are not used.
- + Fixed bug #792 & #794, so that cmake now recognizes Solaris (thanks to Owen
-   Clarke).
+ + Fixed bug #792, #793 & #794, so that cmake now recognizes and builds on
+   Solaris (thanks to Owen Clarke).
 
 # Untracked Bugs, biggest first.
  + Fixed bug that required the '%YAML' prologue in a YAML import.
diff --git a/src/Nibbler.cpp b/src/Nibbler.cpp
index 8378378fd..5143c8c38 100644
--- a/src/Nibbler.cpp
+++ b/src/Nibbler.cpp
@@ -578,7 +578,16 @@ bool Nibbler::getDateISO (time_t& t)
       tms.tm_min   = minute;
       tms.tm_sec   = second;
 
-      t = timegm (&tms);
+      char *tz = getenv ("TZ");
+      setenv ("TZ", "", 1);
+      tzset ();
+      t = mktime (&tms);
+      if (tz)
+        setenv ("TZ", tz, 1);
+      else
+        unsetenv ("TZ");
+      tzset();
+
       return true;
     }
   }