diff --git a/lib/indirizzo/constants.rb b/lib/indirizzo/constants.rb
index 766e31c..3c530d9 100644
--- a/lib/indirizzo/constants.rb
+++ b/lib/indirizzo/constants.rb
@@ -587,6 +587,12 @@ def [] (key)
   # The State constant maps US state and territory names to their 2-letter
   # USPS abbreviations.
   State = Map[
+    "Armed Forces Americas"           => "AA",
+    "Armed Forces Africa"             => "AE",
+    "Armed Forces Canada"             => "AE",
+    "Armed Forces Europe"             => "AE",
+    "Armed Forces Middle East"        => "AE",
+    "Armed Forces Pacific"            => "AP",
     "Alabama"		=> "AL",
     "Alaska"		=> "AK",
     "American Samoa"	=> "AS",