diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 000000000..652426aa9
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "locale"]
+	path = locale
+	url = git://github.com/jsocol/sumo-locales.git
diff --git a/apps/search/templates/results.html b/apps/search/templates/results.html
index 67895e9e1..1e13a9c6c 100644
--- a/apps/search/templates/results.html
+++ b/apps/search/templates/results.html
@@ -26,7 +26,7 @@
 
   <div class="search-count">
     {# L10n: {n} is the number of search results, {q} is the search query, {l} is the language searched. #}
-    {{ ngettext('Found <strong>{n}</strong> result for <strong>{q}</strong> in <strongL>{l}</strong>',
+    {{ ngettext('Found <strong>{n}</strong> result for <strong>{q}</strong> in <strong>{l}</strong>',
                 'Found <strong>{n}</strong> results for <strong>{q}</strong> in <strong>{l}</strong>',
                 num_results)|fe(n=num_results, q=q, l=lang_name) }}
   </div>
diff --git a/locale b/locale
new file mode 160000
index 000000000..e645f9062
--- /dev/null
+++ b/locale
@@ -0,0 +1 @@
+Subproject commit e645f9062e1077c858c155f1330ab87c3a5056ab
diff --git a/settings.py b/settings.py
index 77c2c10f8..4985d4810 100644
--- a/settings.py
+++ b/settings.py
@@ -13,6 +13,8 @@ LOG_LEVEL = logging.DEBUG
 ROOT = os.path.dirname(os.path.abspath(__file__))
 path = lambda *a: os.path.join(ROOT, *a)
 
+ROOT_PACKAGE = os.path.basename(ROOT)
+
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
 )
@@ -71,7 +73,7 @@ LANGUAGES = dict([(i.lower(), LOCALES[i].native)
 
 LANGUAGE_URL_MAP = dict([(i.lower(), i) for i in SUMO_LANGUAGES])
 
-TEXT_DOMAIN = 'k-messages'
+TEXT_DOMAIN = 'messages'
 
 SITE_ID = 1
 SITE_TITLE = _lazy(u'Firefox Support', 'site_title')
@@ -135,7 +137,7 @@ AUTHENTICATION_BACKENDS = (
     'sumo.backends.SessionBackend', # TODO: Replace with Kitsune auth.
 )
 
-ROOT_URLCONF = 'kitsune.urls'
+ROOT_URLCONF = '%s.urls' % ROOT_PACKAGE
 
 TEMPLATE_DIRS = (
     # Put strings here, like "/home/html/django_templates"
@@ -152,6 +154,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'tower',
     'jingo_minify',
+    ROOT_PACKAGE,
     'sumo',
     'search',
 )