diff --git a/ChangeLog b/ChangeLog
index ce14aedfa..aa7fba23c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-02 Riccardo Mottola <rm@gnu.org>
+
+	* Source/NSTimeZone.m: Disable use of tzname on OpenBSD too.
+	
 2011-06-02  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSTimeZone.m: Allow for quotes around zone name in
diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m
index 66291d7fd..fa3f963c3 100644
--- a/Source/NSTimeZone.m
+++ b/Source/NSTimeZone.m
@@ -1,5 +1,5 @@
 /** Time zone management. -*- Mode: ObjC -*-
-   Copyright (C) 1997-2002 Free Software Foundation, Inc.
+   Copyright (C) 1997-20 11Free Software Foundation, Inc.
 
    Written by: Yoo C. Chung <wacko@laplace.snu.ac.kr>
    Date: June 1997
@@ -1615,7 +1615,7 @@ static NSMapTable	*absolutes = 0;
 	}
 
 
-#if HAVE_TZSET && !defined(__FreeBSD__)
+#if HAVE_TZSET && !defined(__FreeBSD__) && !defined(__OpenBSD__)
       /*
        * Try to get timezone from tzset and tzname/daylight.
        * If daylight is non-zero, then tzname[0] is only the name
@@ -1623,6 +1623,7 @@ static NSMapTable	*absolutes = 0;
        * the definitive zone.
        *
        * FreeBSD doesn't implement TZSet fully, so we can't use it there.
+       * Apparently, OpenBSD neither.
        */
       if (localZoneString == nil)
 	{