diff --git a/wareki.fs b/wareki.fs
index b47eafa..dd9b634 100755
--- a/wareki.fs
+++ b/wareki.fs
@@ -1,5 +1,6 @@
 \ wareki.fs - Display WAREKI and Anno Domini corresponding years
-\ +JMJ 2013 David Meyer <papa@sdf.org>
+\ +JMJ 2020 David Meyer <papa@sdf.org>
+\ 2020/3/31 Add Reiwa era
 
 \ help-wareki - Display module help
 : help-wareki ( -- )
@@ -9,13 +10,14 @@
     ." HEISEI ( u -- ) Display A.D. year corresponding to Heisei era year." cr
     ." MEIJI ( u -- ) Display A.D. year corresponding to Meiji era year." cr
     ." NENGO ( u -- ) Display Japanese year in Meiji, Taishou, Shouwa," cr
-    ."                or Heisei eras corresponding to A.D. year." cr
+    ."                Heisei, or Reiwa eras corresponding to A.D. year." cr
+    ." REIWA ( u -- ) Display A.D. year corresponding to Reiwa era year." cr
     ." SHOWA ( u -- ) Display A.D. year corresponding to Shouwa era year." cr
     ." TAISHO ( u -- ) Display A.D. year corresponding to Taishou era year." cr
 ;
 
 \ nengo - Display NENGO for A.D. (Meiji, Taishou, Shouwa,
-\         Heisei eras only)
+\         Heisei, Reiwa eras only)
 : nengo ( u -- )
     dup 1868 < if
 	." ERROR: Year precedes MEIJI era " drop
@@ -41,7 +43,15 @@
 				dup 1989 = if
 				    ." SHOWA 64/HEISEI GANNEN (Jan 8-) " drop
 				else
-				    ." HEISEI " 1988 - .
+                                    dup 2019 < if
+                                        ." HEISEI " 1988 - .
+                                    else
+                                        dup 2019 = if
+                                            ." HEISEI 31/REIWA GANNEN (May 1-) " drop                        
+                                        else
+                                            ." REIWA " 2018 - .
+                                        then
+                                    then
 				then
 			    then
 			then
@@ -100,4 +110,13 @@
     then
 ;
 
+\ reiwa - Display A.D. for Reiwa era NENGO.
+: reiwa ( u -- )
+    dup 0= if
+        ." ERROR: NENGO < 1 " drop
+    else
+        ." AD " 2018 + .
+    then
+;
+
 cr ." Type 'help-wareki' for help"