diff --git a/.gitignore b/.gitignore
index f722ebf..39f7e17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 SOURCES/javazic.tar.gz
-SOURCES/tzcode2018d.tar.gz
-SOURCES/tzdata2018d.tar.gz
+SOURCES/tzcode2018e.tar.gz
+SOURCES/tzdata2018e.tar.gz
diff --git a/.tzdata.metadata b/.tzdata.metadata
index 0bd29d6..fd06b38 100644
--- a/.tzdata.metadata
+++ b/.tzdata.metadata
@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-98aa5e6c73f35bf99ccf82d9a361e3be577cb5ba SOURCES/tzcode2018d.tar.gz
-3b8425bff65fd61ecc6b582315fd5ba238d76bbc SOURCES/tzdata2018d.tar.gz
+e0396f6984aa6831189e90daf0d79334714bb9f6 SOURCES/tzcode2018e.tar.gz
+9ab1932256674075fb74ff84792582b5ac12c476 SOURCES/tzdata2018e.tar.gz
diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec
index c780ffe..b37d175 100644
--- a/SPECS/tzdata.spec
+++ b/SPECS/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018d
-%define tzdata_version 2018d
-%define tzcode_version 2018d
-Release: 1%{?dist}
+Version: 2018e
+%define tzdata_version 2018e
+%define tzcode_version 2018e
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://www.iana.org/time-zones
@@ -42,8 +42,27 @@ This package contains timezone information for use by Java runtimes.
 
 %prep
 %setup -q -c -a 1
+
+# Currently tzdata is providing the "rearguard" data set for maximum
+# compatibility with existing Red Hat Enterprise Linux installs. Future releases of
+# Red Hat Enterprise Linux will be transitioning to the default or "vanguard" tzdata
+# data set.
+#
+# The "rearguard" and "vanguard" data sets are defined by the upstream tzdata project
+# and represent approximately the same data, with "vanguard" optimized for newer time
+# zone data tooling, and "rearguard" optimized for compatibility with existing tooling.
+# For example "vanguard" implements support for negative DST offsets, while "rearguard"
+# supports the traditional format.
+
+# Create the reargard data files.
+make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
+tar zxf tzdata%{version}-rearguard.tar.gz
+
 %patch002 -p1
 
+# Run make to create the tzdata.zi file
+make DATAFORM=rearguard tzdata.zi
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -71,8 +90,6 @@ tar xf %{SOURCE4}
 echo "%{name}%{tzdata_version}" >> VERSION
 
 %build
-# Run make to create the tzdata.zi file
-make tzdata.zi
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
     pacificnew etcetera backward"
@@ -130,6 +147,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun May 06 2018 Patsy Franklin <pfrankli@redhat.com> - 2018e-3
+- Update the tzdata2018e.tar.gz file. Make the tzdata.zi file during prep.
+
+* Fri May 04 2018 Patsy Franklin <pfrankli@redhat.com> - 2018e-2
+- Rebase to tzdata-2018e
+  - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018.
+  - In this update, the upstream project now defaults to using
+    the "vanguard" data implementation which includes negative DST offsets.
+    However, we are continuing to provide the "rearguard" format
+    for data which does not use negative DST offsets to provide
+    better compatibility with existing tools.  We intend to transition
+    to the "vanguard" data implementation in the future.
+
 * Thu Mar 22 2018 Patsy Franklin <pfrankli@redhat.com> - 2018d-1
 - Rebase to tzdata-2018d
   - DST for Asia/Gaza and Asia/Hebron has changed from March 31 to March 24.