diff --git a/NEWS b/NEWS
index 0795c08..1cae014 100644
--- a/NEWS
+++ b/NEWS
@@ -8,7 +8,7 @@ Unreleased, experimental changes
     switch from 3 to 4 hours ahead of UTC on 2016-03-27 at 02:00.
     (Thanks to Alexander Krivenyshev for the heads-up.)
     As a trial of a new system that needs less information to be made up,
-    the new zone uses numeric time zone abbreviations like "+04"
+    the new zone uses numeric time zone abbreviations like "+0400"
     instead of invented abbreviations like "ASTT".
 
   Changes to code
diff --git a/Theory b/Theory
index 6bed91f..d7f91ee 100644
--- a/Theory
+++ b/Theory
@@ -206,7 +206,7 @@ in decreasing order of importance:
 		of standard time; see "Scope of the tz database".
 
 	If there is no common English abbreviation, use numeric offsets like
-		-05 and +0830 that are generated by zic's %z notation.
+		-0500 and +0830 that can be generated by zic's %z notation.
 
     [The remaining guidelines predate the introduction of %z.
     They are problematic as they mean tz data entries invent
diff --git a/europe b/europe
index a0b0b9e..40cd0ea 100644
--- a/europe
+++ b/europe
@@ -2407,16 +2407,16 @@ Zone Europe/Simferopol	 2:16:24 -	LMT	1880
 # http://asozd2.duma.gov.ru/work/dz.nsf/ByID/5AEBD1A341D2B41843257F47003949EF/$File/Текст проекта_третье чтение.doc
 # This Federal Law shall enter into force on 27 March 2016 at 02:00.
 
-Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
-			 3:00	-	+03	1930 Jun 21
-			 4:00	-	+04	1961 Nov 11
-			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 4:00	-	+04	1992 Mar 29  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03	2016 Mar 27  2:00s
-			 4:00	-	+04
+Zone Europe/Astrakhan 3:12:12 - LMT	1924 May
+	 3:00	-	+0300		1930 Jun 21
+	 4:00	-	+0400		1961 Nov 11
+	 4:00	Russia	+0400/+0500	1989 Mar 26  2:00s
+	 3:00	Russia	+0300/+0400	1991 Mar 31  2:00s
+	 4:00	-	+0400		1992 Mar 29  2:00s
+	 3:00	Russia	+0300/+0400	2011 Mar 27  2:00s
+	 4:00	-	+0400		2014 Oct 26  2:00s
+	 3:00	-	+0300		2016 Mar 27  2:00s
+	 4:00	-	+0400
 
 # From Tim Parenti (2014-07-03):
 # Europe/Volgograd covers...