diff --git a/.gitignore b/.gitignore
index 4d7cc31..6a97704 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,7 @@ htmlcov/
 
 # Translations
 *.mo
+completion/conf/locale/*/LC_MESSAGES/*
 
 # IDEs and text editors
 *~
diff --git a/Makefile b/Makefile
index 2e89235..5a6c4a3 100644
--- a/Makefile
+++ b/Makefile
@@ -86,11 +86,11 @@ selfcheck: ## check that the Makefile is well-formed
 
 extract_translations: ## extract strings to be translated, outputting .mo files
 	rm -rf docs/_build
-	cd completion && ../manage.py makemessages -l en -v1 -d django
-	cd completion && ../manage.py makemessages -l en -v1 -d djangojs
+	cd completion && django-admin makemessages -l en -v1 -d django
+	cd completion && django-admin makemessages -l en -v1 -d djangojs
 
 compile_translations: ## compile translation files, outputting .po files for each supported language
-	cd completion && ../manage.py compilemessages
+	cd completion && django-admin compilemessages
 
 detect_changed_source_translations:
 	cd completion && i18n_tool changed
diff --git a/completion/conf/locale/config.yaml b/completion/conf/locale/config.yaml
new file mode 100644
index 0000000..a968d94
--- /dev/null
+++ b/completion/conf/locale/config.yaml
@@ -0,0 +1,4 @@
+# Configuration for i18n workflow.
+
+locales:
+    - en  # English - Source Language
diff --git a/locale/config.yaml b/locale/config.yaml
deleted file mode 100644
index dbfee82..0000000
--- a/locale/config.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-# Configuration for i18n workflow.
-
-locales:
-    - en  # English - Source Language
-    - ar  # Arabic
-    - az  # Azerbaijani
-    - bg_BG  # Bulgarian (Bulgaria)
-    - bn_BD  # Bengali (Bangladesh)
-    - bn_IN  # Bengali (India)
-    - bs  # Bosnian
-    - ca  # Catalan
-    - ca@valencia  # Catalan (Valencia)
-    - cs  # Czech
-    - cy  # Welsh
-    - da  # Danish
-    - de_DE  # German (Germany)
-    - el  # Greek
-    - en@lolcat  # LOLCAT English
-    - en@pirate  # Pirate English
-    - es_419  # Spanish (Latin America)
-    - es_AR  # Spanish (Argentina)
-    - es_EC  # Spanish (Ecuador)
-    - es_ES  # Spanish (Spain)
-    - es_MX  # Spanish (Mexico)
-    - es_PE  # Spanish (Peru)
-    - et_EE  # Estonian (Estonia)
-    - eu_ES  # Basque (Spain)
-    - fa  # Persian
-    - fa_IR  # Persian (Iran)
-    - fi_FI  # Finnish (Finland)
-    - fr  # French
-    - gl  # Galician
-    - gu  # Gujarati
-    - he  # Hebrew
-    - hi  # Hindi
-    - hr  # Croatian
-    - hu  # Hungarian
-    - hy_AM  # Armenian (Armenia)
-    - id  # Indonesian
-    - it_IT  # Italian (Italy)
-    - ja_JP  # Japanese (Japan)
-    - kk_KZ  # Kazakh (Kazakhstan)
-    - km_KH  # Khmer (Cambodia)
-    - kn  # Kannada
-    - ko_KR  # Korean (Korea)
-    - lt_LT  # Lithuanian (Lithuania)
-    - ml  # Malayalam
-    - mn  # Mongolian
-    - ms  # Malay
-    - nb  # Norwegian Bokmål
-    - ne  # Nepali
-    - nl_NL  # Dutch (Netherlands)
-    - or  # Oriya
-    - pl  # Polish
-    - pt_BR  # Portuguese (Brazil)
-    - pt_PT  # Portuguese (Portugal)
-    - ro  # Romanian
-    - ru  # Russian
-    - si  # Sinhala
-    - sk  # Slovak
-    - sl  # Slovenian
-    - th  # Thai
-    - tr_TR  # Turkish (Turkey)
-    - uk  # Ukranian
-    - ur  # Urdu
-    - vi  # Vietnamese
-    - zh_CN  # Chinese (China)
-    - zh_TW  # Chinese (Taiwan)
-
-# The locales used for fake-accented English, for testing.
-dummy_locales:
-    - eo