diff --git a/testing/tests/binding/Restore-Database.result b/testing/tests/binding/Restore-Database.result
index 2c6a0629..893a89f3 100644
--- a/testing/tests/binding/Restore-Database.result
+++ b/testing/tests/binding/Restore-Database.result
@@ -30,7 +30,7 @@
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff --git a/testing/tests/carddav/Restore-Database.result b/testing/tests/carddav/Restore-Database.result
index 48aa1289..61bf628a 100644
--- a/testing/tests/carddav/Restore-Database.result
+++ b/testing/tests/carddav/Restore-Database.result
@@ -30,7 +30,7 @@
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff --git a/testing/tests/regression-suite/0996-PUT-odd-characters.result b/testing/tests/regression-suite/0996-PUT-odd-characters.result
index b090666c..07a8ca0b 100644
--- a/testing/tests/regression-suite/0996-PUT-odd-characters.result
+++ b/testing/tests/regression-suite/0996-PUT-odd-characters.result
@@ -51,8 +51,9 @@ DURATION:P1D
 LOCATION:Chamisal Vineyards\\, Oregon
 X-VENUE:Chamisal Vineyards
 END:VEVENT
+END:VCALENDAR
 <
-         dav_etag: >4d7d14bee6ce017c086e6f1de56f1641<
+         dav_etag: >82d83a8c540d8fa53d5ad843b6456558<
          dav_name: >/User Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics<
       description: >2nd Annual Lobsterfest
 Saturday, August 7
diff --git a/testing/tests/regression-suite/0997-PUT-many-overrides.result b/testing/tests/regression-suite/0997-PUT-many-overrides.result
new file mode 100644
index 00000000..a69e1996
--- /dev/null
+++ b/testing/tests/regression-suite/0997-PUT-many-overrides.result
@@ -0,0 +1,478 @@
+
+       Event Data: >BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Zagreb
+X-LIC-LOCATION:Europe/Zagreb
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20101126T133639Z
+LAST-MODIFIED:20101126T133639Z
+DTSTAMP:20101126T133640Z
+UID:KOrganizer-1348288421.174
+SUMMARY:Kosarkaska utakmica
+DTSTART;TZID=Europe/Zagreb:20101128T110000
+DTEND;TZID=Europe/Zagreb:20101128T130000
+LOCATION:Zagrebacki velesajam
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110402T095510Z
+LAST-MODIFIED:20110402T095533Z
+DTSTAMP:20110402T095533Z
+UID:9fc3d340-fd02-4198-9b7f-bd9b339fdf01
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110329T193000
+DTEND;TZID=Europe/Zagreb:20110329T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110406T222129Z
+DTSTAMP:20110406T222129Z
+UID:b5185f5f-c60d-43e2-8727-d73b05f0b403
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110408T180000
+DTEND;TZID=Europe/Zagreb:20110408T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110410T105121Z
+DTSTAMP:20110410T105121Z
+UID:ad2e3d46-338c-4123-bfed-edf0d06a3f5d
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110411T120000
+DTEND;TZID=Europe/Zagreb:20110411T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110412T145952Z
+DTSTAMP:20110412T145952Z
+UID:97f37cf2-a89a-4eb9-aff7-024e21d4ac63
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110413T200000
+DTEND;TZID=Europe/Zagreb:20110413T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110417T133012Z
+LAST-MODIFIED:20110417T133033Z
+DTSTAMP:20110417T133033Z
+UID:d98993b2-3fc1-4f40-a3b7-1744f2eff118
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110419T193000
+DTEND;TZID=Europe/Zagreb:20110419T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110509T075204Z
+DTSTAMP:20110509T075204Z
+UID:d9600248-ff59-45aa-a08b-d16d09f7443c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110509T150000
+DTEND;TZID=Europe/Zagreb:20110509T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103420Z
+LAST-MODIFIED:20110320T103436Z
+DTSTAMP:20110320T103436Z
+UID:bf913c7d-8e42-4d30-989b-3f86c3e7f130
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110322T200000
+DTEND;TZID=Europe/Zagreb:20110322T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110414T134446Z
+DTSTAMP:20110414T134446Z
+UID:6d870107-9251-4eb1-baff-9cc9c9d995a0
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T120000
+DTEND;TZID=Europe/Zagreb:20110415T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110320T103513Z
+DTSTAMP:20110320T103513Z
+UID:b79f6edf-3b11-439f-85af-7eca5d5e7d6e
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110321T150000
+DTEND;TZID=Europe/Zagreb:20110321T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110405T141143Z
+DTSTAMP:20110405T141143Z
+UID:3bc03dfc-c7e1-4500-ae67-a17c309025e8
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110406T133000
+DTEND;TZID=Europe/Zagreb:20110406T143000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093717Z
+LAST-MODIFIED:20110430T093741Z
+DTSTAMP:20110430T093741Z
+UID:d0fe1e24-25c9-4f1a-a1a5-7e4c38b2a4bd
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110427T193000
+DTEND;TZID=Europe/Zagreb:20110427T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093903Z
+LAST-MODIFIED:20110503T141014Z
+DTSTAMP:20110503T141014Z
+UID:e8835dcb-9c58-446c-8020-1d14e299994b
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110506T190000
+DTEND;TZID=Europe/Zagreb:20110506T220000
+DESCRIPTION:protiv VIDRE\; dvorana u podsusedu
+TRANSP:OPAQUE
+SEQUENCE:2
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110503T141104Z
+DTSTAMP:20110503T141104Z
+UID:631e6b38-c41c-49c6-8902-357650d1332c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110502T150000
+DTEND;TZID=Europe/Zagreb:20110502T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110412T145824Z
+DTSTAMP:20110412T145824Z
+UID:2f32a2e1-f739-4c1a-920b-a605cc969e25
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110411T150000
+DTEND;TZID=Europe/Zagreb:20110411T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110416T203013Z
+DTSTAMP:20110416T203013Z
+UID:63d93f32-aa1d-4aaf-b0c6-f332689c395b
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T140000
+DTEND;TZID=Europe/Zagreb:20110415T150000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110417T195943Z
+DTSTAMP:20110417T195943Z
+UID:96d9a904-21da-44cf-a818-ace2e24117f3
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110418T150000
+DTEND;TZID=Europe/Zagreb:20110418T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110513T180125Z
+LAST-MODIFIED:20110513T180150Z
+DTSTAMP:20110513T180150Z
+UID:6541bbc5-5054-4482-9656-781fccb1c9c0
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110513T160000
+DTEND;TZID=Europe/Zagreb:20110513T170000
+DESCRIPTION:s filom u dvorani Precko
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110520T201034Z
+LAST-MODIFIED:20110520T201057Z
+DTSTAMP:20110520T201057Z
+UID:585e23cf-ef43-459a-9ad7-f05ceadc369e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110524T190000
+DTEND;TZID=Europe/Zagreb:20110524T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110311T213444Z
+LAST-MODIFIED:20110311T213526Z
+DTSTAMP:20110311T213526Z
+UID:abe35ff2-22ca-4abc-84ed-75cd594f152a
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110311T190000
+DTEND;TZID=Europe/Zagreb:20110311T220000
+LOCATION:Rugvica
+DESCRIPTION:igramo protiv STK Rugvice
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110314T195438Z
+LAST-MODIFIED:20110314T195500Z
+DTSTAMP:20110314T195500Z
+UID:f1a6d3ca-6070-453f-ae7d-10e204569461
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110317T200000
+DTEND;TZID=Europe/Zagreb:20110317T210000
+DESCRIPTION:protiv Mladih purgera
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110328T181956Z
+DTSTAMP:20110328T181956Z
+UID:db31907b-1b8a-4f70-aa8e-e2c86ffc125a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110328T150000
+DTEND;TZID=Europe/Zagreb:20110328T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110602T091841Z
+LAST-MODIFIED:20110602T091933Z
+DTSTAMP:20110602T091933Z
+UID:158bce95-0f67-4cfc-9cc0-df42603a7497
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110606T193000
+DTEND;TZID=Europe/Zagreb:20110606T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110603T144349Z
+LAST-MODIFIED:20110603T144405Z
+DTSTAMP:20110603T144405Z
+UID:e0b1fbe6-885e-447b-8811-0d0dafc7cc9a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110603T100000
+DTEND;TZID=Europe/Zagreb:20110603T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110605T191628Z
+LAST-MODIFIED:20110605T191643Z
+DTSTAMP:20110605T191643Z
+UID:d59ca055-4396-442c-af99-5c45cfd8e75d
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110604T180000
+DTEND;TZID=Europe/Zagreb:20110604T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110607T222032Z
+LAST-MODIFIED:20110607T222045Z
+DTSTAMP:20110607T222045Z
+UID:6ec29b6e-c8f3-40b3-87d3-d7ebe742a8cc
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110606T150000
+DTEND;TZID=Europe/Zagreb:20110606T160000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111007T155930Z
+DTSTAMP:20111007T155930Z
+UID:807b2e3b-6bc1-4fd4-8002-6a4a3d6ab210
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111010T200000
+DTEND;TZID=Europe/Zagreb:20111010T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111009T102456Z
+LAST-MODIFIED:20111009T102524Z
+DTSTAMP:20111009T102524Z
+UID:17848910-224e-4b2e-82a1-880e7579fc09
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111009T190000
+DTEND;TZID=Europe/Zagreb:20111009T210000
+LOCATION:faks
+DESCRIPTION:trening s najmanom na faksu
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111010T141132Z
+LAST-MODIFIED:20111010T141158Z
+DTSTAMP:20111010T141158Z
+UID:1dc66abb-d265-4115-bed1-8647076b6a6e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111014T203000
+DTEND;TZID=Europe/Zagreb:20111014T230000
+DESCRIPTION:Odra Vex dizajn
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111014T073406Z
+DTSTAMP:20111014T073406Z
+UID:40881d4c-03b1-4bd6-9486-47c88e42d4a9
+SUMMARY:Girje
+DTSTART;TZID=Europe/Zagreb:20111011T190000
+DTEND;TZID=Europe/Zagreb:20111011T200000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111015T174624Z
+LAST-MODIFIED:20111015T174705Z
+DTSTAMP:20111015T174705Z
+UID:9d8b6e90-6ba9-4bec-8000-e1f9609b84a7
+SUMMARY:Stolni
+DTSTART;TZID=Europe/Zagreb:20111015T170000
+DTEND;TZID=Europe/Zagreb:20111015T190000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111016T111311Z
+LAST-MODIFIED:20111016T111339Z
+DTSTAMP:20111016T111339Z
+UID:8f2601db-6537-40aa-91b5-3bff62c6aaeb
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111018T193000
+DTEND;TZID=Europe/Zagreb:20111018T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130003Z
+DTSTAMP:20111022T130003Z
+UID:c606f5b2-4519-4b4c-9010-96ca6d301e70
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111022T100000
+DTEND;TZID=Europe/Zagreb:20111022T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130030Z
+DTSTAMP:20111022T130030Z
+UID:178d87de-d399-422f-955c-3d8867a7f384
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111023T100000
+DTEND;TZID=Europe/Zagreb:20111023T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111026T212929Z
+DTSTAMP:20111026T212929Z
+UID:104e403e-9639-4316-813f-e843520901a5
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111028T203000
+DTEND;TZID=Europe/Zagreb:20111028T233000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111111T094915Z
+LAST-MODIFIED:20111111T094932Z
+DTSTAMP:20111111T094932Z
+UID:64804e8e-fef5-46e3-b2a2-b494d9120dc1
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111111T190000
+DTEND;TZID=Europe/Zagreb:20111111T213000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111113T175921Z
+LAST-MODIFIED:20111113T175937Z
+DTSTAMP:20111113T175937Z
+UID:72181664-03b7-4789-90a0-8bbec9300b5c
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111116T193000
+DTEND;TZID=Europe/Zagreb:20111116T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T133937Z
+DTSTAMP:20111126T133937Z
+UID:f3f56428-d648-4d8a-9174-57927d74e346
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111124T193000
+DTEND;TZID=Europe/Zagreb:20111124T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T134122Z
+DTSTAMP:20111126T134122Z
+UID:548df49b-2451-4224-bd7b-5780dd93a19e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111201T193000
+DTEND;TZID=Europe/Zagreb:20111201T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RRULE:FREQ=WEEKLY;UNTIL=20111220T180000Z;BYDAY=MO,TH
+DTSTART;TZID=Europe/Zagreb:20111013T190000
+DTEND;TZID=Europe/Zagreb:20111013T200000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:3
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T134122Z
+LAST-MODIFIED:20111126T134129Z
+DTSTAMP:20111126T134129Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111201T190000
+DTSTART;TZID=Europe/Zagreb:20111130T190000
+DTEND;TZID=Europe/Zagreb:20111130T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111127T154352Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111205T190000
+DTSTART;TZID=Europe/Zagreb:20111206T190000
+DTEND;TZID=Europe/Zagreb:20111206T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:3
+END:VEVENT
+END:VCALENDAR
+<
+         dav_etag: >76e05bffe4f06d622b02cc0095b5eb25<
+         dav_name: >/User Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics<
+      description: >NULL<
+          dtstart: >2010-11-28 23:00:00+13<
+          summary: >Kosarkaska utakmica<
+
diff --git a/testing/tests/regression-suite/0997-PUT-many-overrides.test b/testing/tests/regression-suite/0997-PUT-many-overrides.test
new file mode 100644
index 00000000..810b1419
--- /dev/null
+++ b/testing/tests/regression-suite/0997-PUT-many-overrides.test
@@ -0,0 +1,489 @@
+#
+# Attempt to put an event containing many overrides
+#
+TYPE=PUT
+URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics
+
+HEADER=Content-Type: text/calendar; charset=utf-8
+AUTH=User Six:user6
+
+BEGINDATA
+BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Zagreb
+X-LIC-LOCATION:Europe/Zagreb
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20101126T133639Z
+LAST-MODIFIED:20101126T133639Z
+DTSTAMP:20101126T133640Z
+UID:KOrganizer-1348288421.174
+SUMMARY:Kosarkaska utakmica
+DTSTART;TZID=Europe/Zagreb:20101128T110000
+DTEND;TZID=Europe/Zagreb:20101128T130000
+LOCATION:Zagrebacki velesajam
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110402T095510Z
+LAST-MODIFIED:20110402T095533Z
+DTSTAMP:20110402T095533Z
+UID:9fc3d340-fd02-4198-9b7f-bd9b339fdf01
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110329T193000
+DTEND;TZID=Europe/Zagreb:20110329T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110406T222129Z
+DTSTAMP:20110406T222129Z
+UID:b5185f5f-c60d-43e2-8727-d73b05f0b403
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110408T180000
+DTEND;TZID=Europe/Zagreb:20110408T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110410T105121Z
+DTSTAMP:20110410T105121Z
+UID:ad2e3d46-338c-4123-bfed-edf0d06a3f5d
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110411T120000
+DTEND;TZID=Europe/Zagreb:20110411T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110412T145952Z
+DTSTAMP:20110412T145952Z
+UID:97f37cf2-a89a-4eb9-aff7-024e21d4ac63
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110413T200000
+DTEND;TZID=Europe/Zagreb:20110413T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110417T133012Z
+LAST-MODIFIED:20110417T133033Z
+DTSTAMP:20110417T133033Z
+UID:d98993b2-3fc1-4f40-a3b7-1744f2eff118
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110419T193000
+DTEND;TZID=Europe/Zagreb:20110419T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110509T075204Z
+DTSTAMP:20110509T075204Z
+UID:d9600248-ff59-45aa-a08b-d16d09f7443c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110509T150000
+DTEND;TZID=Europe/Zagreb:20110509T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103420Z
+LAST-MODIFIED:20110320T103436Z
+DTSTAMP:20110320T103436Z
+UID:bf913c7d-8e42-4d30-989b-3f86c3e7f130
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110322T200000
+DTEND;TZID=Europe/Zagreb:20110322T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110414T134446Z
+DTSTAMP:20110414T134446Z
+UID:6d870107-9251-4eb1-baff-9cc9c9d995a0
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T120000
+DTEND;TZID=Europe/Zagreb:20110415T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110320T103513Z
+DTSTAMP:20110320T103513Z
+UID:b79f6edf-3b11-439f-85af-7eca5d5e7d6e
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110321T150000
+DTEND;TZID=Europe/Zagreb:20110321T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110405T141143Z
+DTSTAMP:20110405T141143Z
+UID:3bc03dfc-c7e1-4500-ae67-a17c309025e8
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110406T133000
+DTEND;TZID=Europe/Zagreb:20110406T143000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093717Z
+LAST-MODIFIED:20110430T093741Z
+DTSTAMP:20110430T093741Z
+UID:d0fe1e24-25c9-4f1a-a1a5-7e4c38b2a4bd
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110427T193000
+DTEND;TZID=Europe/Zagreb:20110427T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093903Z
+LAST-MODIFIED:20110503T141014Z
+DTSTAMP:20110503T141014Z
+UID:e8835dcb-9c58-446c-8020-1d14e299994b
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110506T190000
+DTEND;TZID=Europe/Zagreb:20110506T220000
+DESCRIPTION:protiv VIDRE\; dvorana u podsusedu
+TRANSP:OPAQUE
+SEQUENCE:2
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110503T141104Z
+DTSTAMP:20110503T141104Z
+UID:631e6b38-c41c-49c6-8902-357650d1332c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110502T150000
+DTEND;TZID=Europe/Zagreb:20110502T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110412T145824Z
+DTSTAMP:20110412T145824Z
+UID:2f32a2e1-f739-4c1a-920b-a605cc969e25
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110411T150000
+DTEND;TZID=Europe/Zagreb:20110411T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110416T203013Z
+DTSTAMP:20110416T203013Z
+UID:63d93f32-aa1d-4aaf-b0c6-f332689c395b
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T140000
+DTEND;TZID=Europe/Zagreb:20110415T150000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110417T195943Z
+DTSTAMP:20110417T195943Z
+UID:96d9a904-21da-44cf-a818-ace2e24117f3
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110418T150000
+DTEND;TZID=Europe/Zagreb:20110418T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110513T180125Z
+LAST-MODIFIED:20110513T180150Z
+DTSTAMP:20110513T180150Z
+UID:6541bbc5-5054-4482-9656-781fccb1c9c0
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110513T160000
+DTEND;TZID=Europe/Zagreb:20110513T170000
+DESCRIPTION:s filom u dvorani Precko
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110520T201034Z
+LAST-MODIFIED:20110520T201057Z
+DTSTAMP:20110520T201057Z
+UID:585e23cf-ef43-459a-9ad7-f05ceadc369e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110524T190000
+DTEND;TZID=Europe/Zagreb:20110524T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110311T213444Z
+LAST-MODIFIED:20110311T213526Z
+DTSTAMP:20110311T213526Z
+UID:abe35ff2-22ca-4abc-84ed-75cd594f152a
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110311T190000
+DTEND;TZID=Europe/Zagreb:20110311T220000
+LOCATION:Rugvica
+DESCRIPTION:igramo protiv STK Rugvice
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110314T195438Z
+LAST-MODIFIED:20110314T195500Z
+DTSTAMP:20110314T195500Z
+UID:f1a6d3ca-6070-453f-ae7d-10e204569461
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110317T200000
+DTEND;TZID=Europe/Zagreb:20110317T210000
+DESCRIPTION:protiv Mladih purgera
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110328T181956Z
+DTSTAMP:20110328T181956Z
+UID:db31907b-1b8a-4f70-aa8e-e2c86ffc125a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110328T150000
+DTEND;TZID=Europe/Zagreb:20110328T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110602T091841Z
+LAST-MODIFIED:20110602T091933Z
+DTSTAMP:20110602T091933Z
+UID:158bce95-0f67-4cfc-9cc0-df42603a7497
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110606T193000
+DTEND;TZID=Europe/Zagreb:20110606T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110603T144349Z
+LAST-MODIFIED:20110603T144405Z
+DTSTAMP:20110603T144405Z
+UID:e0b1fbe6-885e-447b-8811-0d0dafc7cc9a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110603T100000
+DTEND;TZID=Europe/Zagreb:20110603T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110605T191628Z
+LAST-MODIFIED:20110605T191643Z
+DTSTAMP:20110605T191643Z
+UID:d59ca055-4396-442c-af99-5c45cfd8e75d
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110604T180000
+DTEND;TZID=Europe/Zagreb:20110604T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110607T222032Z
+LAST-MODIFIED:20110607T222045Z
+DTSTAMP:20110607T222045Z
+UID:6ec29b6e-c8f3-40b3-87d3-d7ebe742a8cc
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110606T150000
+DTEND;TZID=Europe/Zagreb:20110606T160000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111007T155930Z
+DTSTAMP:20111007T155930Z
+UID:807b2e3b-6bc1-4fd4-8002-6a4a3d6ab210
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111010T200000
+DTEND;TZID=Europe/Zagreb:20111010T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111009T102456Z
+LAST-MODIFIED:20111009T102524Z
+DTSTAMP:20111009T102524Z
+UID:17848910-224e-4b2e-82a1-880e7579fc09
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111009T190000
+DTEND;TZID=Europe/Zagreb:20111009T210000
+LOCATION:faks
+DESCRIPTION:trening s najmanom na faksu
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111010T141132Z
+LAST-MODIFIED:20111010T141158Z
+DTSTAMP:20111010T141158Z
+UID:1dc66abb-d265-4115-bed1-8647076b6a6e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111014T203000
+DTEND;TZID=Europe/Zagreb:20111014T230000
+DESCRIPTION:Odra Vex dizajn
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111014T073406Z
+DTSTAMP:20111014T073406Z
+UID:40881d4c-03b1-4bd6-9486-47c88e42d4a9
+SUMMARY:Girje
+DTSTART;TZID=Europe/Zagreb:20111011T190000
+DTEND;TZID=Europe/Zagreb:20111011T200000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111015T174624Z
+LAST-MODIFIED:20111015T174705Z
+DTSTAMP:20111015T174705Z
+UID:9d8b6e90-6ba9-4bec-8000-e1f9609b84a7
+SUMMARY:Stolni
+DTSTART;TZID=Europe/Zagreb:20111015T170000
+DTEND;TZID=Europe/Zagreb:20111015T190000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111016T111311Z
+LAST-MODIFIED:20111016T111339Z
+DTSTAMP:20111016T111339Z
+UID:8f2601db-6537-40aa-91b5-3bff62c6aaeb
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111018T193000
+DTEND;TZID=Europe/Zagreb:20111018T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130003Z
+DTSTAMP:20111022T130003Z
+UID:c606f5b2-4519-4b4c-9010-96ca6d301e70
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111022T100000
+DTEND;TZID=Europe/Zagreb:20111022T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130030Z
+DTSTAMP:20111022T130030Z
+UID:178d87de-d399-422f-955c-3d8867a7f384
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111023T100000
+DTEND;TZID=Europe/Zagreb:20111023T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111026T212929Z
+DTSTAMP:20111026T212929Z
+UID:104e403e-9639-4316-813f-e843520901a5
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111028T203000
+DTEND;TZID=Europe/Zagreb:20111028T233000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111111T094915Z
+LAST-MODIFIED:20111111T094932Z
+DTSTAMP:20111111T094932Z
+UID:64804e8e-fef5-46e3-b2a2-b494d9120dc1
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111111T190000
+DTEND;TZID=Europe/Zagreb:20111111T213000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111113T175921Z
+LAST-MODIFIED:20111113T175937Z
+DTSTAMP:20111113T175937Z
+UID:72181664-03b7-4789-90a0-8bbec9300b5c
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111116T193000
+DTEND;TZID=Europe/Zagreb:20111116T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T133937Z
+DTSTAMP:20111126T133937Z
+UID:f3f56428-d648-4d8a-9174-57927d74e346
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111124T193000
+DTEND;TZID=Europe/Zagreb:20111124T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T134122Z
+DTSTAMP:20111126T134122Z
+UID:548df49b-2451-4224-bd7b-5780dd93a19e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111201T193000
+DTEND;TZID=Europe/Zagreb:20111201T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RRULE:FREQ=WEEKLY;UNTIL=20111220T180000Z;BYDAY=MO,TH
+DTSTART;TZID=Europe/Zagreb:20111013T190000
+DTEND;TZID=Europe/Zagreb:20111013T200000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:3
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T134122Z
+LAST-MODIFIED:20111126T134129Z
+DTSTAMP:20111126T134129Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111201T190000
+DTSTART;TZID=Europe/Zagreb:20111130T190000
+DTEND;TZID=Europe/Zagreb:20111130T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111127T154352Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111205T190000
+DTSTART;TZID=Europe/Zagreb:20111206T190000
+DTEND;TZID=Europe/Zagreb:20111206T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:3
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.caldav_data AS "Event Data", caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary, description
+  FROM caldav_data JOIN calendar_item USING(dav_name)
+  WHERE caldav_data.dav_name ~ 'c0f7c860-1345-012d-125f-002421a2359e.ics'
+ENDQUERY
+
+
diff --git a/testing/tests/scheduling/Restore-Database.result b/testing/tests/scheduling/Restore-Database.result
index 08356c1e..e8e8775f 100644
--- a/testing/tests/scheduling/Restore-Database.result
+++ b/testing/tests/scheduling/Restore-Database.result
@@ -30,7 +30,7 @@
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff --git a/testing/tests/timezone/5010-list.result b/testing/tests/timezone/5010-list.result
index a2df3fe0..2375a6d0 100644
--- a/testing/tests/timezone/5010-list.result
+++ b/testing/tests/timezone/5010-list.result
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 3064
+Content-Length: 3238
 Content-Type: application/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -30,6 +30,12 @@ Content-Type: application/xml; charset="utf-8"
   <inactive/>
   <local-name lang="en_US">Europe/Prague</local-name>
  </summary>
+ <summary>
+  <tzid>Europe/Zagreb</tzid>
+  <last-modified>all good</last-modified>
+  <inactive/>
+  <local-name lang="en_US">Europe/Zagreb</local-name>
+ </summary>
  <summary>
   <tzid>/mozilla.org/20050126_1/Antarctica/McMurdo</tzid>
   <last-modified>all good</last-modified>
diff --git a/testing/tests/timezone/5020-updatecheck.result b/testing/tests/timezone/5020-updatecheck.result
index 4eafa2ca..1b7a4a13 100644
--- a/testing/tests/timezone/5020-updatecheck.result
+++ b/testing/tests/timezone/5020-updatecheck.result
@@ -46,7 +46,7 @@ Writing new zone for 'Europe/Rome'
 Writing new zone for 'Europe/Vilnius'
 Writing new zone for 'Europe/Skopje'
 Writing new zone for 'Europe/Vaduz'
-Writing new zone for 'Europe/Zagreb'
+Writing updated zone for 'Europe/Zagreb'
 Writing new zone for 'Europe/Paris'
 Writing new zone for 'Europe/Luxembourg'
 Writing new zone for 'Europe/Kaliningrad'
@@ -365,4 +365,4 @@ Writing new zone for 'Asia/Amman'
 Writing new zone for 'Asia/Jakarta'
 Writing new zone for 'Asia/Baghdad'
 Writing new zone for 'Asia/Rangoon'
-Added 362 new zones, updated data for 5 zones and added 0 new aliases
+Added 361 new zones, updated data for 6 zones and added 0 new aliases
diff --git a/testing/tests/timezone/Restore-Database.result b/testing/tests/timezone/Restore-Database.result
index a13d63ab..92a25f9f 100644
--- a/testing/tests/timezone/Restore-Database.result
+++ b/testing/tests/timezone/Restore-Database.result
@@ -30,7 +30,7 @@
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval