diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index bdd2250667..0e23c189b3 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.60 2008/07/01 03:40:55 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/timezone/pgtz.c,v 1.61 2008/11/13 20:49:38 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1499,6 +1499,12 @@ pg_tzenumerate_next(pg_tzenum *dir)
 			continue;
 		}
 
+		if (!tz_acceptable(&dir->tz))
+		{
+			/* Ignore leap-second zones */
+			continue;
+		}
+
 		/* Timezone loaded OK. */
 		return &dir->tz;
 	}