diff --git a/lib/config/_lookup.txt b/lib/config/_lookup.txt
new file mode 100644
index 0000000000..53875ad24b
--- /dev/null
+++ b/lib/config/_lookup.txt
@@ -0,0 +1,256 @@
+AC - Ascension Island
+AD - Andorra
+AE - United Arab Emirates
+AF - Afghanistan
+AG - Antigua and Barbuda
+AI - Anguilla
+AL - Albania
+AM - Armenia
+AN - Netherlands Antilles
+AO - Angola
+AQ - Antarctica
+AR - Argentina
+AS - American Samoa
+AT - Austria
+AU - Australia
+AW - Aruba
+AX - Aland Islands
+AZ - Azerbaijan
+BA - Bosnia and Herzegovina
+BB - Barbados
+BD - Bangladesh
+BE - Belgium
+BF - Burkina Faso
+BG - Bulgaria
+BH - Bahrain
+BI - Burundi
+BJ - Benin
+BM - Bermuda
+BN - Brunei Darussalam
+BO - Bolivia
+BR - Brazil
+BS - Bahamas
+BT - Bhutan
+BV - Bouvet Island
+BW - Botswana
+BY - Belarus
+BZ - Belize
+CA - Canada
+CC - Cocos (Keeling) Islands
+CD - Congo, Democratic Republic
+CF - Central African Republic
+CG - Congo
+CH - Switzerland
+CI - Cote D'Ivoire (Ivory Coast)
+CK - Cook Islands
+CL - Chile
+CM - Cameroon
+CN - China
+CO - Colombia
+CR - Costa Rica
+CS - Czechoslovakia (former)
+CU - Cuba
+CV - Cape Verde
+CX - Christmas Island
+CY - Cyprus
+CZ - Czech Republic
+DE - Germany
+DJ - Djibouti
+DK - Denmark
+DM - Dominica
+DO - Dominican Republic
+DZ - Algeria
+EC - Ecuador
+EE - Estonia
+EG - Egypt
+EH - Western Sahara
+ER - Eritrea
+ES - Spain
+ET - Ethiopia
+EU - European Union
+FI - Finland
+FJ - Fiji
+FK - Falkland Islands (Malvinas)
+FM - Micronesia
+FO - Faroe Islands
+FR - France
+FX - France, Metropolitan
+GA - Gabon
+GB - Great Britain (UK)
+GD - Grenada
+GE - Georgia
+GF - French Guiana
+GG - Guernsey
+GH - Ghana
+GI - Gibraltar
+GL - Greenland
+GM - Gambia
+GN - Guinea
+GP - Guadeloupe
+GQ - Equatorial Guinea
+GR - Greece
+GS - S. Georgia and S. Sandwich Isls.
+GT - Guatemala
+GU - Guam
+GW - Guinea-Bissau
+GY - Guyana
+HK - Hong Kong
+HM - Heard and McDonald Islands
+HN - Honduras
+HR - Croatia (Hrvatska)
+HT - Haiti
+HU - Hungary
+ID - Indonesia
+IE - Ireland
+IL - Israel
+IM - Isle of Man
+IN - India
+IO - British Indian Ocean Territory
+IQ - Iraq
+IR - Iran
+IS - Iceland
+IT - Italy
+JE - Jersey
+JM - Jamaica
+JO - Jordan
+JP - Japan
+KE - Kenya
+KG - Kyrgyzstan
+KH - Cambodia
+KI - Kiribati
+KM - Comoros
+KN - Saint Kitts and Nevis
+KP - Korea (North)
+KR - Korea (South)
+KW - Kuwait
+KY - Cayman Islands
+KZ - Kazakhstan
+LA - Laos
+LB - Lebanon
+LC - Saint Lucia
+LI - Liechtenstein
+LK - Sri Lanka
+LR - Liberia
+LS - Lesotho
+LT - Lithuania
+LU - Luxembourg
+LV - Latvia
+LY - Libya
+MA - Morocco
+MC - Monaco
+MD - Moldova
+ME - Montenegro
+MF - Saint Martin
+MG - Madagascar
+MH - Marshall Islands
+MK - F.Y.R.O.M. (Macedonia)
+ML - Mali
+MM - Myanmar
+MN - Mongolia
+MO - Macau
+MP - Northern Mariana Islands
+MQ - Martinique
+MR - Mauritania
+MS - Montserrat
+MT - Malta
+MU - Mauritius
+MV - Maldives
+MW - Malawi
+MX - Mexico
+MY - Malaysia
+MZ - Mozambique
+NA - Namibia
+NC - New Caledonia
+NE - Niger
+NF - Norfolk Island
+NG - Nigeria
+NI - Nicaragua
+NL - Netherlands
+NO - Norway
+NP - Nepal
+NR - Nauru
+NT - Neutral Zone
+NU - Niue
+NZ - New Zealand (Aotearoa)
+OM - Oman
+PA - Panama
+PE - Peru
+PF - French Polynesia
+PG - Papua New Guinea
+PH - Philippines
+PK - Pakistan
+PL - Poland
+PM - St. Pierre and Miquelon
+PN - Pitcairn
+PR - Puerto Rico
+PS - Palestinian Territory, Occupied
+PT - Portugal
+PW - Palau
+PY - Paraguay
+QA - Qatar
+RE - Reunion
+RS - Serbia
+RO - Romania
+RU - Russian Federation
+RW - Rwanda
+SA - Saudi Arabia
+SB - Solomon Islands
+SC - Seychelles
+SD - Sudan
+SE - Sweden
+SG - Singapore
+SH - St. Helena
+SI - Slovenia
+SJ - Svalbard & Jan Mayen Islands
+SK - Slovak Republic
+SL - Sierra Leone
+SM - San Marino
+SN - Senegal
+SO - Somalia
+SR - Suriname
+SS - South Sudan
+ST - Sao Tome and Principe
+SU - USSR (former)
+SV - El Salvador
+SY - Syria
+SZ - Swaziland
+TC - Turks and Caicos Islands
+TD - Chad
+TF - French Southern Territories
+TG - Togo
+TH - Thailand
+TJ - Tajikistan
+TK - Tokelau
+TM - Turkmenistan
+TN - Tunisia
+TO - Tonga
+TP - East Timor
+TR - Turkey
+TT - Trinidad and Tobago
+TV - Tuvalu
+TW - Taiwan
+TZ - Tanzania
+UA - Ukraine
+UG - Uganda
+UK - United Kingdom
+UM - US Minor Outlying Islands
+US - United States
+UY - Uruguay
+UZ - Uzbekistan
+VA - Vatican City State (Holy See)
+VC - Saint Vincent & the Grenadines
+VE - Venezuela
+VG - British Virgin Islands
+VI - Virgin Islands (U.S.)
+VN - Viet Nam
+VU - Vanuatu
+WF - Wallis and Futuna Islands
+WS - Samoa
+XK - Kosovo*
+YE - Yemen
+YT - Mayotte
+YU - Serbia and Montenegro (former Yugoslavia)
+ZA - South Africa
+ZM - Zambia
+ZW - Zimbabwe
+ZR - Zaire; See CD Congo, Democratic Republic
\ No newline at end of file
diff --git a/lib/config/ca.txt b/lib/config/ca.txt
new file mode 100644
index 0000000000..5f0fefe014
--- /dev/null
+++ b/lib/config/ca.txt
@@ -0,0 +1,8 @@
+# source: http://en.wikipedia.org/wiki/List_of_universities_in_Canada
+
+ualberta.ca
+athabascau.ca
+ucalgary.ca
+uleth.ca
+mtroyal.ca
+macewan.ca
\ No newline at end of file
diff --git a/lib/config/es.txt b/lib/config/es.txt
new file mode 100644
index 0000000000..7aa66db840
--- /dev/null
+++ b/lib/config/es.txt
@@ -0,0 +1 @@
+ugr.es
\ No newline at end of file
diff --git a/lib/config/mx.txt b/lib/config/mx.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/lib/email.rb b/lib/email.rb
index 2cc5bdcb41..6d323180f9 100644
--- a/lib/email.rb
+++ b/lib/email.rb
@@ -18,5 +18,13 @@ module Email
         false
       end
     end
-end
+
+    def populate_academic_domains
+      Dir::foreach("lib/config") do |file|
+        unless file == '_lookup.txt' || file == "."
+          puts file
+        end
+      end
+    end
+  end
 end
\ No newline at end of file
diff --git a/test/test_email.rb b/test/test_email.rb
index 6b08bfb25f..5eeb5abcf9 100644
--- a/test/test_email.rb
+++ b/test/test_email.rb
@@ -13,4 +13,8 @@ class TestEmail < Test::Unit::TestCase
     assert_equal Email::academic?('lee@stanford.edu.com'),          false
     assert_equal Email::academic?('lee@strath.ac.uk.com'),          false
   end
+
+  should "should populate academic domains" do
+    Email::populate_academic_domains
+  end
 end