diff --git a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
index 74499d28f..470b908a3 100644
--- a/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
+++ b/jollyday-core/src/main/java/de/focus_shift/jollyday/core/HolidayCalendar.java
@@ -11,7 +11,7 @@
  */
 public enum HolidayCalendar {
 
-  ALBANIA("AL"), ANDORRA("AD"), ARGENTINA("AR"), AUSTRALIA("AU"), AUSTRIA("AT"),
+  ALBANIA("AL"), ANDORRA("AD"), ARGENTINA("AR"), ARMENIA("AM"), AUSTRALIA("AU"), AUSTRIA("AT"),
   BAHAMAS("BS"), BELARUS("BY"), BELGIUM("BE"), BERMUDA("BM"), BOLIVIA("BO"), BOSNIA_HERZIGOWINA("BA"), BRAZIL("BR"), BRITISH_VIRGIN_ISLANDS("VG"), BULGARIA("BG"),
   CANADA(Locale.CANADA.getCountry()), CAYMAN_ISLANDS("KY"), CHILE("CL"), COLOMBIA("CO"), COSTA_RICA("CR"), CROATIA("HR"), CUBA("CU"), CZECH_REPUBLIC("CZ"), CYPRUS("CY"),
   DENMARK("DK"), DOW_JONES_STOXX("DJ_STOXX"),
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
index b2c4bd7a1..f1287c9ff 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions.properties
@@ -12,6 +12,17 @@ country.description.ag        = Antigua And Barbuda
 country.description.ai        = Anguilla
 country.description.al        = Albania
 country.description.am        = Armenia
+country.description.am.ag     = Aragatsotn
+country.description.am.ar     = Ararat
+country.description.am.av     = Armavir
+country.description.am.er     = Yerevan
+country.description.am.gr     = Gegharkunik
+country.description.am.kt     = Kotayk
+country.description.am.lo     = Lori
+country.description.am.sh     = Shirak
+country.description.am.su     = Syunik
+country.description.am.tv     = Tavush
+country.description.am.vd     = Vayots Dzor
 country.description.an        = Netherlands Antilles
 country.description.ao        = Angola
 country.description.aq        = Antarctica
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
index f57639c22..00bc3cfb4 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_de.properties
@@ -12,6 +12,17 @@ country.description.ag        = Antigua und Barbuda
 country.description.ai        = Anguilla
 country.description.al        = Albanien
 country.description.am        = Armenien
+country.description.am.ag     = Aragatsotn
+country.description.am.ar     = Ararat
+country.description.am.av     = Armavir
+country.description.am.er     = Jerewan
+country.description.am.gr     = Gegharkunik
+country.description.am.kt     = Kotajk
+country.description.am.lo     = Lori
+country.description.am.sh     = Schirak
+country.description.am.su     = Sjunik
+country.description.am.tv     = Tawusch
+country.description.am.vd     = Wajoz Dsor
 country.description.an        = Niederländische Antillen
 country.description.ao        = Angola
 country.description.aq        = Antarktis
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
index 473d9e86f..09c43cb5b 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_el.properties
@@ -12,6 +12,17 @@ country.description.ag        = Αντίγκουα και Μπαρμπούντα
 country.description.ai        = Ανγκουίλα
 country.description.al        = Αλβανία
 country.description.am        = Αρμενία
+country.description.am.ag     = Αραγκατσότν
+country.description.am.ar     = Αραράτ
+country.description.am.av     = Αρμαβίρ
+country.description.am.er     = Ερεβάν
+country.description.am.gr     = Γκεγκαρκουνίκ
+country.description.am.kt     = Κοτάικ
+country.description.am.lo     = Λορί
+country.description.am.sh     = Σιράκ
+country.description.am.su     = Σιουνίκ
+country.description.am.tv     = Ταβούς
+country.description.am.vd     = Βαγιότς Ντζόρ
 country.description.an        = Ολλανδικές Αντίλλες
 country.description.ao        = Ανγκόλα
 country.description.aq        = Ανταρκτική
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
index bb42ed4e4..f79c1280b 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_fr.properties
@@ -12,6 +12,17 @@ country.description.ag        = Antigua-et-Barbuda
 country.description.ai        = Anguilla
 country.description.al        = Albanie
 country.description.am        = Arménie
+country.description.am.ag     = Aragatsotn
+country.description.am.ar     = Ararat
+country.description.am.av     = Armavir
+country.description.am.er     = Erevan
+country.description.am.gr     = Gegharkunik
+country.description.am.kt     = Kotayk
+country.description.am.lo     = Lori
+country.description.am.sh     = Chirak
+country.description.am.su     = Syunik
+country.description.am.tv     = Tavush
+country.description.am.vd     = Vayots Dzor
 country.description.an        = Antilles néerlandaises
 country.description.ao        = Angola
 country.description.aq        = Antarctique
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
index bc24b653f..1ddc37799 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_nl.properties
@@ -12,6 +12,17 @@ country.description.ag        = Antigua And Barbuda
 country.description.ai        = Anguilla
 country.description.al        = Albania
 country.description.am        = Armenia
+country.description.am.ag     = Aragatsotn
+country.description.am.ar     = Ararat
+country.description.am.av     = Armavir
+country.description.am.er     = Jerevan
+country.description.am.gr     = Gegharkunik
+country.description.am.kt     = Kotayk
+country.description.am.lo     = Lori
+country.description.am.sh     = Sjirok
+country.description.am.su     = Sjoenik
+country.description.am.tv     = Tavoesj
+country.description.am.vd     = Vayots Dzor
 country.description.an        = Netherlands Antilles
 country.description.ao        = Angola
 country.description.aq        = Antarctica
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
index ef3a3bce5..6df3672d0 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_pt.properties
@@ -12,6 +12,17 @@ country.description.ag        = Antígua e Barbuda
 country.description.ai        = Anguilha
 country.description.al        = Albânia
 country.description.am        = Arménia
+country.description.am.ag     = Aragatsotn
+country.description.am.ar     = Ararat
+country.description.am.av     = Armavir
+country.description.am.er     = Erevan
+country.description.am.gr     = Gegharkunik
+country.description.am.kt     = Kotayk
+country.description.am.lo     = Lori
+country.description.am.sh     = Shirak
+country.description.am.su     = Syunik
+country.description.am.tv     = Tavush
+country.description.am.vd     = Vayots Dzor
 country.description.an        = Antilhas Neerlandesas
 country.description.ao        = Angola
 country.description.aq        = Antárctica
diff --git a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
index f345ddd7f..bef5c1d9c 100644
--- a/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
+++ b/jollyday-core/src/main/resources/descriptions/country_descriptions_sv.properties
@@ -12,6 +12,17 @@ country.description.ag        = Antigua And Barbuda
 country.description.ai        = Anguilla
 country.description.al        = Albania
 country.description.am        = Armenia
+country.description.am.ag     = Aragatsotn
+country.description.am.ar     = Ararat
+country.description.am.av     = Armavir
+country.description.am.er     = Jerevan
+country.description.am.gr     = Gegharkunik
+country.description.am.kt     = Kotayk
+country.description.am.lo     = Lori
+country.description.am.sh     = Sjurak
+country.description.am.su     = Sjunik
+country.description.am.tv     = Tavusj
+country.description.am.vd     = Vayots Dzor
 country.description.an        = Netherlands Antilles
 country.description.ao        = Angola
 country.description.aq        = Antarctica
diff --git a/jollyday-core/src/main/resources/holidays/Holidays_am.xml b/jollyday-core/src/main/resources/holidays/Holidays_am.xml
new file mode 100644
index 000000000..4a50e6501
--- /dev/null
+++ b/jollyday-core/src/main/resources/holidays/Holidays_am.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Configuration hierarchy="am" description="Armenia"
+               xmlns="https://focus_shift.de/jollyday/schema/holiday"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xsi:schemaLocation="https://focus_shift.de/jollyday/schema/holiday https://focus_shift.de/jollyday/schema/holiday/holiday.xsd">
+  <Holidays>
+    <Fixed month="JANUARY" day="1" descriptionPropertiesKey="NEW_YEAR"/>
+    <Fixed month="JANUARY" day="2" descriptionPropertiesKey="NEW_YEAR"/>
+    <Fixed month="JANUARY" day="5" descriptionPropertiesKey="CHRISTMAS"/>
+    <Fixed month="JANUARY" day="6" descriptionPropertiesKey="CHRISTMAS"/>
+    <Fixed month="JANUARY" day="28" descriptionPropertiesKey="ARMY_DAY"/>
+    <Fixed month="MARCH" day="8" descriptionPropertiesKey=""/>
+    <Fixed month="APRIL" day="24" descriptionPropertiesKey=""/>
+    <Fixed month="MAY" day="1" descriptionPropertiesKey="LABOUR_DAY"/>
+    <Fixed month="MAY" day="9" descriptionPropertiesKey=""/>
+    <Fixed month="MAY" day="28" descriptionPropertiesKey="REPUBLIC_DAY"/>
+    <Fixed month="JULY" day="5" descriptionPropertiesKey="CONSTITUTION_DAY"/>
+    <Fixed month="SEPTEMBER" day="21" descriptionPropertiesKey="INDEPENDENCE_DAY"/>
+    <Fixed month="DECEMBER" day="31" descriptionPropertiesKey="NEW_YEARS_EVE"/>
+
+    <ChristianHoliday type="EASTER" descriptionPropertiesKey="christian.EASTER"/>
+  </Holidays>
+
+  <Sources>
+    <Source>https://en.wikipedia.org/wiki/Public_holidays_in_Armenia</Source>
+    <Source of="ISO 3166-2">https://en.wikipedia.org/wiki/ISO_3166-2:AM</Source>
+  </Sources>
+
+  <SubConfigurations hierarchy="ag" description="Aragatsotn">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="ar" description="Ararat">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="av" description="Armavir">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="er" description="Yerevan">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="gr" description="Gegharkunik">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="kt" description="Kotayk">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="lo" description="Lori">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="sh" description="Shirak">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="su" description="Syunik">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="tv" description="Tavush">
+    <Holidays/>
+  </SubConfigurations>
+
+  <SubConfigurations hierarchy="vd" description="Vayots Dzor">
+    <Holidays/>
+  </SubConfigurations>
+</Configuration>
diff --git a/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayAMTest.java b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayAMTest.java
new file mode 100644
index 000000000..8384238c9
--- /dev/null
+++ b/jollyday-tests/src/test/java/de/focus_shift/jollyday/tests/country/HolidayAMTest.java
@@ -0,0 +1,37 @@
+package de.focus_shift.jollyday.tests.country;
+
+import org.junit.jupiter.api.Test;
+
+import static de.focus_shift.jollyday.core.HolidayCalendar.ARMENIA;
+import static de.focus_shift.jollyday.tests.CalendarCheckerApi.assertFor;
+import static java.time.Month.APRIL;
+import static java.time.Month.DECEMBER;
+import static java.time.Month.JANUARY;
+import static java.time.Month.JULY;
+import static java.time.Month.MARCH;
+import static java.time.Month.MAY;
+import static java.time.Month.SEPTEMBER;
+
+class HolidayAMTest {
+
+  @Test
+  void ensuresHolidays() {
+
+    assertFor(ARMENIA)
+      .hasFixedHoliday("NEW_YEAR", JANUARY, 1).and()
+      .hasFixedHoliday("NEW_YEAR", JANUARY, 2).and()
+      .hasFixedHoliday("CHRISTMAS", JANUARY, 5).and()
+      .hasFixedHoliday("CHRISTMAS", JANUARY, 6).and()
+      .hasFixedHoliday("ARMY_DAY", JANUARY, 28).and()
+      .hasFixedHoliday("", MARCH, 8).and()
+      .hasFixedHoliday("", APRIL, 24).and()
+      .hasFixedHoliday("LABOUR_DAY", MAY, 1).and()
+      .hasFixedHoliday("", MAY, 9).and()
+      .hasFixedHoliday("REPUBLIC_DAY", MAY, 28).and()
+      .hasFixedHoliday("CONSTITUTION_DAY", JULY, 5).and()
+      .hasFixedHoliday("INDEPENDENCE_DAY", SEPTEMBER, 21).and()
+      .hasFixedHoliday("NEW_YEARS_EVE", DECEMBER, 31).and()
+      .hasChristianHoliday("EASTER")
+      .check();
+  }
+}