diff --git a/money/Money.py b/money/Money.py
index e3d0c02..fc7ee6f 100644
--- a/money/Money.py
+++ b/money/Money.py
@@ -358,3 +358,249 @@ def from_string(self, s):
 CURRENCY['LTL'] = Currency(code='LTL', numeric='440', name='Lithuanian Litas', countries=['LITHUANIA'])
 CURRENCY['ETB'] = Currency(code='ETB', numeric='230', name='Ethiopian Birr', countries=['ETHIOPIA'])
 CURRENCY['XPF'] = Currency(code='XPF', numeric='953', name='CFP Franc', countries=['FRENCH POLYNESIA', 'NEW CALEDONIA', 'WALLIS AND FUTUNA'])
+
+#
+# Dictionary of currencies by ISO country code
+# Source: http://www.panalpina.com/www/global/en/tools_resources/unit_converter/currency_codes.html
+# and http://www.oanda.com/help/currency-iso-code-country
+# Countries commented out do not have a currency entry above, but should.
+#
+
+CURRENCY_BY_COUNTRY = {
+   'AF': CURRENCY['AFN'],
+   'AL': CURRENCY['ALL'],
+   'DZ': CURRENCY['DZD'],
+   'AS': CURRENCY['EUR'],
+   'AD': CURRENCY['EUR'],
+   'AO': CURRENCY['AOA'],
+   'AI': CURRENCY['XCD'],
+   'AG': CURRENCY['XCD'],
+   'AR': CURRENCY['ARS'],
+   'AM': CURRENCY['AMD'],
+   'AW': CURRENCY['ANG'],
+   'AU': CURRENCY['AUD'],
+   'AT': CURRENCY['EUR'],
+   'AZ': CURRENCY['AZN'],
+   'BS': CURRENCY['BSD'],
+   'BH': CURRENCY['BHD'],
+   'BD': CURRENCY['BDT'],
+   'BB': CURRENCY['BBD'],
+   'BY': CURRENCY['BYR'],
+   'BE': CURRENCY['EUR'],
+   'BZ': CURRENCY['BZD'],
+   #'BJ': CURRENCY['XOF'],
+   'BM': CURRENCY['BMD'],
+   #'BT': CURRENCY['BTN'],
+   #'BO': CURRENCY['BOB'],
+   'BA': CURRENCY['BAM'],
+   'BW': CURRENCY['BWP'],
+   'BV': CURRENCY['NOK'],
+   'BR': CURRENCY['BRL'],
+   'IO': CURRENCY['USD'],
+   'BN': CURRENCY['BND'],
+   'BG': CURRENCY['BGN'],
+   #'BF': CURRENCY['XOF'],
+   'BI': CURRENCY['BIF'],
+   'KH': CURRENCY['KHR'],
+   #'CM': CURRENCY['XAF'],
+   'CA': CURRENCY['CAD'],
+   'CV': CURRENCY['CVE'],
+   'KY': CURRENCY['KYD'],
+   #'CF': CURRENCY['XAF'],
+   #'TD': CURRENCY['XAF'],
+   #'CL': CURRENCY['CLP'],
+   'CN': CURRENCY['CNY'],
+   'CX': CURRENCY['AUD'],
+   'CC': CURRENCY['AUD'],
+   #'CO': CURRENCY['COP'],
+   'KM': CURRENCY['KMF'],
+   #'CG': CURRENCY['XAF'],
+   #'CD': CURRENCY['CDF'],
+   'CK': CURRENCY['NZD'],
+   'CR': CURRENCY['CRC'],
+   'HR': CURRENCY['HRK'],
+   'CU': CURRENCY['CUP'],
+   'CY': CURRENCY['EUR'],
+   'CZ': CURRENCY['CZK'],
+   'DK': CURRENCY['DKK'],
+   'DJ': CURRENCY['DJF'],
+   'DM': CURRENCY['XCD'],
+   'DO': CURRENCY['DOP'],
+   'TP': CURRENCY['IDR'],
+   #'EC': CURRENCY['ECS'],
+   'EG': CURRENCY['EGP'],
+   #'SV': CURRENCY['SVC'],
+   #'GQ': CURRENCY['XAF'],
+   'ER': CURRENCY['ERN'],
+   'EE': CURRENCY['EEK'],
+   'ET': CURRENCY['ETB'],
+   'FK': CURRENCY['FKP'],
+   'FO': CURRENCY['DKK'],
+   'FJ': CURRENCY['FJD'],
+   'FI': CURRENCY['EUR'],
+   'FR': CURRENCY['EUR'],
+   'GF': CURRENCY['EUR'],
+   'PF': CURRENCY['XPF'],
+   'TF': CURRENCY['EUR'],
+   #'GA': CURRENCY['XAF'],
+   'GM': CURRENCY['GMD'],
+   'GE': CURRENCY['GEL'],
+   'DE': CURRENCY['EUR'],
+   'GH': CURRENCY['GHS'],
+   'GI': CURRENCY['GIP'],
+   'GR': CURRENCY['EUR'],
+   'GL': CURRENCY['DKK'],
+   'GD': CURRENCY['XCD'],
+   'GP': CURRENCY['EUR'],
+   'GU': CURRENCY['USD'],
+   'GT': CURRENCY['GTQ'],
+   'GN': CURRENCY['GNF'],
+   #'GW': CURRENCY['XOF'],
+   'GY': CURRENCY['GYD'],
+   #'HT': CURRENCY['HTG'],
+   'HM': CURRENCY['AUD'],
+   'HN': CURRENCY['HNL'],
+   'HK': CURRENCY['HKD'],
+   'HU': CURRENCY['HUF'],
+   'IS': CURRENCY['ISK'],
+   'IN': CURRENCY['INR'],
+   'ID': CURRENCY['IDR'],
+   'IR': CURRENCY['IRR'],
+   'IQ': CURRENCY['IQD'],
+   'IE': CURRENCY['EUR'],
+   'IL': CURRENCY['ILS'],
+   'IT': CURRENCY['EUR'],
+   #'CI': CURRENCY['XOF'],
+   'JM': CURRENCY['JMD'],
+   'JP': CURRENCY['JPY'],
+   'JO': CURRENCY['JOD'],
+   'KZ': CURRENCY['KZT'],
+   'KE': CURRENCY['KES'],
+   'KI': CURRENCY['AUD'],
+   'KP': CURRENCY['KPW'],
+   'KR': CURRENCY['KRW'],
+   'KW': CURRENCY['KWD'],
+   'KG': CURRENCY['KGS'],
+   'LA': CURRENCY['LAK'],
+   'LV': CURRENCY['LVL'],
+   'LB': CURRENCY['LBP'],
+   #'LS': CURRENCY['LSL'],
+   'LR': CURRENCY['LRD'],
+   'LY': CURRENCY['LYD'],
+   'LI': CURRENCY['CHF'],
+   'LT': CURRENCY['LTL'],
+   'LU': CURRENCY['EUR'],
+   'MO': CURRENCY['MOP'],
+   'MK': CURRENCY['MKD'],
+   #'MG': CURRENCY['MGF'],
+   'MW': CURRENCY['MWK'],
+   'MY': CURRENCY['MYR'],
+   'MV': CURRENCY['MVR'],
+   #'ML': CURRENCY['XOF'],
+   'MT': CURRENCY['EUR'],
+   'MH': CURRENCY['USD'],
+   'MQ': CURRENCY['EUR'],
+   'MR': CURRENCY['MRO'],
+   'MU': CURRENCY['MUR'],
+   'YT': CURRENCY['EUR'],
+   #'MX': CURRENCY['MXN'],
+   'FM': CURRENCY['USD'],
+   'MD': CURRENCY['MDL'],
+   'MC': CURRENCY['EUR'],
+   'MN': CURRENCY['MNT'],
+   'MS': CURRENCY['XCD'],
+   'MA': CURRENCY['MAD'],
+   'MZ': CURRENCY['MZN'],
+   'MM': CURRENCY['MMK'],
+   'NA': CURRENCY['ZAR'],
+   'NR': CURRENCY['AUD'],
+   'NP': CURRENCY['NPR'],
+   'NL': CURRENCY['EUR'],
+   'AN': CURRENCY['ANG'],
+   'NC': CURRENCY['XPF'],
+   'NZ': CURRENCY['NZD'],
+   'NI': CURRENCY['NIO'],
+   #'NE': CURRENCY['XOF'],
+   'NG': CURRENCY['NGN'],
+   'NU': CURRENCY['NZD'],
+   'NF': CURRENCY['AUD'],
+   'MP': CURRENCY['USD'],
+   'NO': CURRENCY['NOK'],
+   'OM': CURRENCY['OMR'],
+   'PK': CURRENCY['PKR'],
+   'PW': CURRENCY['USD'],
+   #'PA': CURRENCY['PAB'],
+   'PG': CURRENCY['PGK'],
+   'PY': CURRENCY['PYG'],
+   'PE': CURRENCY['PEN'],
+   'PH': CURRENCY['PHP'],
+   'PN': CURRENCY['NZD'],
+   'PL': CURRENCY['PLN'],
+   'PT': CURRENCY['EUR'],
+   'PR': CURRENCY['USD'],
+   'QA': CURRENCY['QAR'],
+   'RE': CURRENCY['EUR'],
+   'RO': CURRENCY['RON'],
+   'RU': CURRENCY['RUB'],
+   'RW': CURRENCY['RWF'],
+   'KN': CURRENCY['XCD'],
+   'LC': CURRENCY['XCD'],
+   'VC': CURRENCY['XCD'],
+   'WS': CURRENCY['WST'],
+   'SM': CURRENCY['EUR'],
+   'ST': CURRENCY['STD'],
+   'SA': CURRENCY['SAR'],
+   #'SN': CURRENCY['XOF'],
+   'SC': CURRENCY['SCR'],
+   'SL': CURRENCY['SLL'],
+   'SG': CURRENCY['SGD'],
+   'SK': CURRENCY['SKK'],
+   'SI': CURRENCY['EUR'],
+   'SB': CURRENCY['SBD'],
+   'SO': CURRENCY['SOS'],
+   'ZA': CURRENCY['ZAR'],
+   'GS': CURRENCY['GBP'],
+   'ES': CURRENCY['EUR'],
+   'LK': CURRENCY['LKR'],
+   'SD': CURRENCY['SDG'],
+   'SR': CURRENCY['SRD'],
+   'SJ': CURRENCY['NOK'],
+   'SZ': CURRENCY['SZL'],
+   'SE': CURRENCY['SEK'],
+   'CH': CURRENCY['CHF'],
+   'SY': CURRENCY['SYP'],
+   'TW': CURRENCY['TWD'],
+   'TJ': CURRENCY['TJS'],
+   'TZ': CURRENCY['TZS'],
+   'TH': CURRENCY['THB'],
+   #'TG': CURRENCY['XOF'],
+   'TK': CURRENCY['NZD'],
+   'TO': CURRENCY['TOP'],
+   'TT': CURRENCY['TTD'],
+   'TN': CURRENCY['TND'],
+   'TR': CURRENCY['TRY'],
+   'TM': CURRENCY['TMM'],
+   'TC': CURRENCY['USD'],
+   'TV': CURRENCY['AUD'],
+   'UG': CURRENCY['UGX'],
+   'UA': CURRENCY['UAH'],
+   'AE': CURRENCY['AED'],
+   'GB': CURRENCY['GBP'],
+   'US': CURRENCY['USD'],
+   'UM': CURRENCY['USD'],
+   #'UY': CURRENCY['UYU'],
+   'UZ': CURRENCY['UZS'],
+   'VU': CURRENCY['VUV'],
+   'VA': CURRENCY['EUR'],
+   #'VE': CURRENCY['VEF'],
+   'VN': CURRENCY['VND'],
+   'VG': CURRENCY['USD'],
+   'VI': CURRENCY['USD'],
+   'WF': CURRENCY['XPF'],
+   'EH': CURRENCY['MAD'],
+   'YE': CURRENCY['YER'],
+   #'YU': CURRENCY['YUN'],
+   'ZM': CURRENCY['ZMK'],
+   'ZW': CURRENCY['ZWD'],
+}
+