diff --git a/support_files/definitions/europe/andorra/country_andorra.xml b/support_files/definitions/europe/andorra/country_andorra.xml
new file mode 100644
index 00000000..562ab9fe
--- /dev/null
+++ b/support_files/definitions/europe/andorra/country_andorra.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<country>
+  <name>Andorra</name>
+  <symbol>flag_andorra.png</symbol>
+  <sid>andorra</sid>
+  <rating>4</rating>
+
+  <leagues>
+    <league>andorra1</league>
+    <league>andorra2</league>
+    </leagues>
+
+  <cups>
+    <cup>andorra_cup</cup>
+    <cup>europe_uefa1</cup>
+    <cup>europe_champ_league</cup>
+    <cup>supercup_europe_uefa</cup>
+    <cup>supercup_europe_intercontinental</cup>
+    <cup>andorra_supercup</cup>
+    <cup>andorra_prom_games1</cup>
+  </cups>
+
+</country>
diff --git a/support_files/definitions/europe/andorra/cup_andorra_cup.xml b/support_files/definitions/europe/andorra/cup_andorra_cup.xml
new file mode 100644
index 00000000..d3371656
--- /dev/null
+++ b/support_files/definitions/europe/andorra/cup_andorra_cup.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<cup>
+  <name>Copa Constitució</name>
+  <short_name>Copa C.</short_name>
+  <symbol>flag_andorra.png</symbol>
+  <sid>andorra_cup</sid>
+  <last_week>48</last_week>
+  <week_gap>4</week_gap>
+  <property>national</property>
+
+  <cup_rounds>
+    <cup_round>
+      <home_away>0</home_away>
+
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>andorra2</choose_team_sid>
+        </choose_team>
+      </choose_teams>
+      <byes>1</byes>
+      <delay>-2</delay>
+    </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>andorra1</choose_team_sid>
+	  <number_of_teams>4</number_of_teams>
+	  <start_idx>5</start_idx>
+	  <end_idx>8</end_idx>
+	  <randomly>1</randomly>
+        </choose_team>
+      </choose_teams>
+      <delay>-5</delay>
+    </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+
+      <choose_teams>
+        <choose_team>
+          <choose_team_sid>andorra1</choose_team_sid>
+	  <number_of_teams>4</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>4</end_idx>
+	  <randomly>1</randomly>
+        </choose_team>
+      </choose_teams>
+      <delay>-7</delay>
+    </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+      <delay>3</delay>
+    </cup_round>
+
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+    </cup_round>
+  </cup_rounds>
+</cup>
\ No newline at end of file
diff --git a/support_files/definitions/europe/andorra/cup_andorra_prom_games1.xml b/support_files/definitions/europe/andorra/cup_andorra_prom_games1.xml
new file mode 100644
index 00000000..57369a7a
--- /dev/null
+++ b/support_files/definitions/europe/andorra/cup_andorra_prom_games1.xml
@@ -0,0 +1,33 @@
+<cup>
+  <name>Andorra Promotion Games</name>
+  <short_name>And. Prom.</short_name>
+  <symbol>flag_andorra.png</symbol>
+  <sid>andorra_prom_games1</sid>
+  <add_week>1000</add_week>
+  <property>national</property>
+  <property>highlight2</property>
+  <yellow_red>3</yellow_red>
+
+  <cup_rounds>
+
+    <cup_round>
+      <choose_teams>
+	<choose_team>
+	  <choose_team_sid>andorra2</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>2</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
+
+	<choose_team>
+	  <choose_team_sid>andorra1</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>7</start_idx>
+	  <end_idx>7</end_idx>
+	</choose_team>
+      </choose_teams>
+    </cup_round>
+
+  </cup_rounds>
+
+</cup>
diff --git a/support_files/definitions/europe/andorra/cup_andorra_supercup.xml b/support_files/definitions/europe/andorra/cup_andorra_supercup.xml
new file mode 100644
index 00000000..51b5dc29
--- /dev/null
+++ b/support_files/definitions/europe/andorra/cup_andorra_supercup.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>	
+<cup>
+  <name>Andorran Supercup</name>
+  <short_name>Supercup</short_name>
+  <symbol>flag_andorra.png</symbol>
+  <sid>andorra_supercup</sid>
+  <last_week>11</last_week>
+  <property>national</property>
+  <group>151</group>
+
+  <cup_rounds>
+    <cup_round>
+      <home_away>0</home_away>
+      <neutral>1</neutral>
+
+      <choose_teams>	
+	<choose_team>
+	  <choose_team_sid>andorra_cup</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>1</end_idx>
+	</choose_team>
+
+	<choose_team>
+	  <choose_team_sid>andorra1</choose_team_sid>
+	  <number_of_teams>1</number_of_teams>
+	  <start_idx>1</start_idx>
+	  <end_idx>2</end_idx>
+	</choose_team>
+      </choose_teams>
+
+    </cup_round>
+  </cup_rounds>
+</cup>
\ No newline at end of file
diff --git a/support_files/definitions/europe/andorra/league_andorra1.xml b/support_files/definitions/europe/andorra/league_andorra1.xml
new file mode 100644
index 00000000..0c598b29
--- /dev/null
+++ b/support_files/definitions/europe/andorra/league_andorra1.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>andorra1</sid>
+  <name>Primera Divisió</name>
+  <short_name>Primera</short_name>
+  <symbol>flag_andorra.png</symbol>
+  <first_week>12</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="1">15</break_in>
+  <break_in length="1">20</break_in>
+  <break_in length="4">25</break_in>
+  <break_in length="1">35</break_in>
+  <average_talent>5300</average_talent>
+  <round_robins>4</round_robins>
+  <names_file>spain</names_file>
+  <yellow_red>5</yellow_red>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>5</rank_start>
+      <rank_end>5</rank_end>
+      <dest_sid>andorra2</dest_sid>
+      <prom_rel_type>relegation</prom_rel_type>
+    </prom_rel_element>
+  </prom_rel>
+
+   <teams>
+    <team>
+      <team_name>Santa Coloma</team_name>
+<team_average_talent>3900</team_average_talent>
+    </team>
+    <team>
+      <team_name>Sant Julià</team_name>
+<team_average_talent>3800</team_average_talent>   
+ </team>
+    <team>
+      <team_name>Principat</team_name>
+<team_average_talent>3700</team_average_talent>
+    </team>
+    <team>
+      <team_name>Encamp</team_name>
+<team_average_talent>3700</team_average_talent>
+    </team>
+    <team>
+      <team_name>Rànger's</team_name>
+<team_average_talent>3600</team_average_talent>
+    </team>
+   </teams>
+</league>
diff --git a/support_files/definitions/europe/andorra/league_andorra2.xml b/support_files/definitions/europe/andorra/league_andorra2.xml
new file mode 100644
index 00000000..ad55094a
--- /dev/null
+++ b/support_files/definitions/europe/andorra/league_andorra2.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<league>
+  <sid>andorra2</sid>
+  <name>Segona Divisió</name>
+  <short_name>Segona</short_name>
+  <symbol>flag_andorra.png</symbol>
+  <first_week>12</first_week>
+  <week_gap>1</week_gap>
+  <break_in length="1">15</break_in>
+  <break_in length="1">20</break_in>
+  <break_in length="4">25</break_in>
+  <break_in length="1">35</break_in>
+  <average_talent>4800</average_talent>
+  <round_robins>4</round_robins>
+  <names_file>spain</names_file>
+  <yellow_red>5</yellow_red>
+
+  <prom_rel>
+    <prom_rel_element>
+      <rank_start>1</rank_start>
+      <rank_end>1</rank_end>
+      <dest_sid>andorra1</dest_sid>
+      <prom_rel_type>promotion</prom_rel_type>
+    </prom_rel_element>
+
+    <prom_games>
+      <prom_games_dest_sid>andorra1</prom_games_dest_sid>
+      <prom_games_cup_sid>andorra_prom_games1</prom_games_cup_sid>
+      <prom_games_loser_sid>andorra2</prom_games_loser_sid>
+    </prom_games>
+  </prom_rel> 
+
+   <teams>
+    <team>
+      <team_name>Encamp</team_name>
+    </team>
+    <team>
+      <team_name>A. C. d'Escaldes</team_name>
+    </team>
+    <team>
+      <team_name>Lusitans II</team_name>
+    </team>
+    <team>
+      <team_name>Principat II</team_name>
+    </team>
+    <team>
+      <team_name>Extremenya</team_name>
+    </team>
+    <team>
+      <team_name>E. Casa Del Benfica</team_name>
+    </team>
+    <team>
+      <team_name>Jenlai</team_name>
+    </team>
+   </teams>
+</league>
\ No newline at end of file