diff --git a/.gitignore b/.gitignore
index acb4ae4..d884dd4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,3 +166,5 @@ noarch/
 /tzdata2018e.tar.gz
 /tzcode2018g.tar.gz
 /tzdata2018g.tar.gz
+/tzcode2018i.tar.gz
+/tzdata2018i.tar.gz
diff --git a/sources b/sources
index d4eb179..c893706 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484
-SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa
+SHA512 (tzcode2018i.tar.gz) = 1a3d53043f20b8252f7598f547d78e7294d9e0cf1fcdd2159354d9769f824c8c8a03cef9cbb7fa579345fdb41372335117d2ef782ecd9c107dd0526e59492d9d
+SHA512 (tzdata2018i.tar.gz) = 6afcacb377842190648ed26f01abcf3db37aa2e7c63d8c509c29b4bc0078b7ff2d4e5375291b9f53498215b9e2f04936bc6145e2f651ae0be6d8166d8d336f6a
diff --git a/tzdata.spec b/tzdata.spec
index c101b02..5d93cc1 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018g
-%define tzdata_version 2018g
-%define tzcode_version 2018g
+Version: 2018i
+%define tzdata_version 2018i
+%define tzcode_version 2018i
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -41,11 +41,11 @@ This package contains timezone information for use by Java runtimes.
 
 %patch002 -p1
 
-# tzdata-2018g introduce 25:00 transition times.  This breaks OpenJDK.
-# Use rearguard for tzdata-2018g java
+# tzdata-2018g introduced 25:00 transition times.  This breaks OpenJDK.
+# Use rearguard for java
 mkdir rearguard
 make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
-mv tzdata2018g-rearguard.tar.gz rearguard
+mv tzdata%{version}-rearguard.tar.gz rearguard
 pushd rearguard
 tar zxf tzdata%{version}-rearguard.tar.gz
 popd
@@ -89,7 +89,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
 
 # grep -v tz-art.htm tz-link.htm > tz-link.html
 
-# tzdata-2018g uses 25:00 which breaks java - use the rearguard files for java
+# tzdata-2018g introduced 25:00 which breaks java - use the rearguard files for java
 JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
       rearguard/australasia rearguard/europe rearguard/northamerica \
       rearguard/southamerica rearguard/pacificnew rearguard/etcetera \