diff --git a/ChangeLog b/ChangeLog
index dd08e60249..14fbf51104 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2009-06-26  Andreas Schwab  <aschwab@redhat.com>
 
+	* timezone/zic.c (stringzone): Don't try to generate a POSIX TZ
+	string when the timezone ends in DST.
+
 	* sysdeps/powerpc/powerpc32/____longjmp_chk.S (CHECK_SP): Save lr
 	before call.
 	* sysdeps/powerpc/powerpc64/____longjmp_chk.S (CHECK_SP):
diff --git a/timezone/zic.c b/timezone/zic.c
index 01d9f135bd..76df6532a7 100644
--- a/timezone/zic.c
+++ b/timezone/zic.c
@@ -1921,7 +1921,7 @@ const int			zonecount;
 		if (stdrp != NULL && stdrp->r_hiyear == 2037)
 			return;
 	}
-	if (stdrp == NULL && zp->z_nrules != 0)
+	if (stdrp == NULL && (zp->z_nrules != 0 || zp->z_stdoff != 0))
 		return;
 	abbrvar = (stdrp == NULL) ? "" : stdrp->r_abbrvar;
 	doabbr(result, zp->z_format, abbrvar, FALSE, TRUE);