diff --git a/lib/asn1/der_get.c b/lib/asn1/der_get.c
index 511ac87bf..2a51dc401 100644
--- a/lib/asn1/der_get.c
+++ b/lib/asn1/der_get.c
@@ -212,8 +212,12 @@ generalizedtime2time (char *s, time_t *t)
   tm.tm_isdst = 0;
 
   *t = mktime(&tm);
-#if 1 /* XXX */
+#ifdef HAVE_STRUCT_TM_TM_GMTOFF
+  *t += tm.tm_gmtoff;
+#elif defined(HAVE_TIMEZONE)
   *t -= timezone;
+#else
+#error Cannot figure out where in timezoneworld we are
 #endif
 }