diff --git a/Bugzilla.i18n.php b/Bugzilla.i18n.php
deleted file mode 100644
index 0647599..0000000
--- a/Bugzilla.i18n.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-$messages = array();
-
-$messages['en'] = array(
-	'bugzilla-desc' => 'This extension allows read-only integration with Bugzilla via the REST API',
-);
-
-$messages['qqq'] = array(
-	'bugzilla-desc' => '{{desc}}',
-);
diff --git a/Bugzilla.php b/Bugzilla.php
index 2c48a59..97ae0d0 100755
--- a/Bugzilla.php
+++ b/Bugzilla.php
@@ -21,7 +21,7 @@
 $wgExtensionCredits['other'][] = array(
     'name'        => 'Bugzilla',
     'author'      => 'Christian Legnitto',
-    'url'         => 'https://github.com/LegNeato/mediawiki-bugzilla',
+    'url'         => 'https://github.com/mozilla/mediawiki-bugzilla',
     'descriptionmsg' => 'bugzilla-desc',
     'license-name' => 'MPL2'
 );
@@ -42,8 +42,7 @@
  */
 
 $cwd = dirname(__FILE__); // We don't need to do this more than once!
-
-$wgExtensionMessagesFiles['Bugzilla'] =  "$cwd/Bugzilla.i18n.php";
+$wgMessagesDirs['Bugzilla'] = __DIR__ . '/i18n';
 
 $wgAutoloadClasses['Bugzilla']           = $cwd . '/Bugzilla.class.php';
 $wgAutoloadClasses['BugzillaQuery']      = $cwd . '/BugzillaQuery.class.php';
diff --git a/i18n/de.json b/i18n/de.json
new file mode 100644
index 0000000..5af0d1f
--- /dev/null
+++ b/i18n/de.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Dennis Roczek"
+		]
+	},
+	"bugzilla-desc": "Diese Erweiterung erlaubt die lesende Integration mit Bugzilla's REST API"
+}
diff --git a/i18n/en.json b/i18n/en.json
new file mode 100644
index 0000000..76e7108
--- /dev/null
+++ b/i18n/en.json
@@ -0,0 +1,5 @@
+{
+	"@metadata": {
+	},
+	"bugzilla-desc": "This extension allows read-only integration with Bugzilla via the REST API"
+}
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 0000000..3c727c3
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,7 @@
+{
+	"@metadata": {
+	},
+	"bugzilla-desc": "[[Special:Version]] description"
+}
+
+
diff --git a/web/js/jquery.dataTables.js b/web/js/jquery.dataTables.js
index 4c445b1..b013a79 100644
--- a/web/js/jquery.dataTables.js
+++ b/web/js/jquery.dataTables.js
@@ -964,6 +964,7 @@
 			 * Notes:    The words in the format _VAR_ are variables which are dynamically replaced
 			 *   by javascript
 			 */
+			 //TODO: replace these entries with the i18n keywords
 			this.oLanguage = {
 				"sProcessing": "Processing...",
 				"sLengthMenu": "Show _MENU_ entries",