diff --git a/test/lit.cfg b/test/lit.cfg
index 6c0637379..2eb130a3c 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -202,6 +202,14 @@ locales = {
         'ru_RU.UTF-8': 'Russian_Russia.1251',
         'zh_CN.UTF-8': 'Chinese_China.936',
     },
+    'FreeBSD' : {
+        'en_US.UTF-8': 'en_US.UTF-8',
+        'cs_CZ.ISO8859-2': 'cs_CZ.ISO8859-2',
+        'fr_FR.UTF-8': 'fr_FR.UTF-8',
+        'fr_CA.ISO8859-1': 'fr_CA.ISO8859-1',
+        'ru_RU.UTF-8': 'ru_RU.UTF-8',
+        'zh_CN.UTF-8': 'zh_CN.UTF-8',
+    },
 }
 
 for feature, loc in locales[platform.system()].items():
@@ -279,6 +287,8 @@ if link_flags_str is None:
         link_flags += ['-lsupc++']
       elif cxx_abi == 'libcxxabi':
         link_flags += ['-lc++abi']
+      elif cxx_abi == 'libcxxrt':
+        link_flags += ['-lcxxrt']
       elif cxx_abi == 'none':
         pass
       else:
@@ -289,6 +299,8 @@ if link_flags_str is None:
       elif sys.platform == 'linux2':
         link_flags += [ '-lgcc_eh', '-lc', '-lm', '-lpthread',
               '-lrt', '-lgcc_s']
+      elif sys.platform == 'freebsd10':
+        link_flags += ['-lc', '-lm', '-lpthread', '-lgcc_s']
       else:
         lit_config.fatal("unrecognized system")
 
@@ -314,6 +326,8 @@ elif sys.platform == 'linux2':
         link_flags += ['-Wl,-R', libcxx_obj_root + '/lib']
     compile_flags += ['-D__STDC_FORMAT_MACROS', '-D__STDC_LIMIT_MACROS',
         '-D__STDC_CONSTANT_MACROS']
+elif sys.platform == 'freebsd10':
+    lit_config.warning('support for freebsd10 is experimental')
 else:
     lit_config.fatal("unrecognized system")