diff --git a/lang/en/mimetypes.php b/lang/en/mimetypes.php
index 38892265c6056..15b8463559546 100644
--- a/lang/en/mimetypes.php
+++ b/lang/en/mimetypes.php
@@ -36,6 +36,7 @@
  */
 
 $string['application/epub_zip'] = 'EPUB ebook';
+$string['application/json'] = '{$a->MIMETYPE2} text';
 $string['application/msword'] = 'Word document';
 $string['application/pdf'] = 'PDF document';
 $string['application/vnd.moodle.backup'] = 'Moodle backup';
diff --git a/lib/classes/filetypes.php b/lib/classes/filetypes.php
index 23c01913b0c15..4a84e55815cba 100644
--- a/lib/classes/filetypes.php
+++ b/lib/classes/filetypes.php
@@ -139,6 +139,7 @@ protected static function get_default_types() {
             'jpg' => array('type' => 'image/jpeg', 'icon' => 'jpeg', 'groups' => array('image', 'web_image'), 'string' => 'image'),
             'jqz' => array('type' => 'text/xml', 'icon' => 'markup'),
             'js' => array('type' => 'application/x-javascript', 'icon' => 'text', 'groups' => array('web_file')),
+            'json' => array('type' => 'application/json', 'icon' => 'text'),
             'latex' => array('type' => 'application/x-latex', 'icon' => 'text'),
             'm' => array('type' => 'text/plain', 'icon' => 'sourcecode'),
             'mbz' => array('type' => 'application/vnd.moodle.backup', 'icon' => 'moodle'),