diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 4443c9b3ab6..45ecb5b5a02 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3624,5 +3624,21 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2014041500.01);
     }
 
+    if ($oldversion < 2014043000.00) {
+            // Fixing possible wrong MIME type for DigiDoc files.
+            $extensions = array('%.bdoc', '%.cdoc', '%.ddoc');
+            $select = $DB->sql_like('filename', '?', false);
+            foreach ($extensions as $extension) {
+                $DB->set_field_select(
+                    'files',
+                    'mimetype',
+                    'application/x-digidoc',
+                    $select,
+                    array($extension)
+                );
+            }
+            upgrade_main_savepoint(true, 2014043000.00);
+        }
+
     return true;
 }
diff --git a/lib/filelib.php b/lib/filelib.php
index 884b626943f..d45b13d908e 100644
--- a/lib/filelib.php
+++ b/lib/filelib.php
@@ -1410,6 +1410,9 @@ function &get_mimetypes_array() {
         'dmg'  => array ('type'=>'application/octet-stream', 'icon'=>'unknown'),
 
         'doc'  => array ('type'=>'application/msword', 'icon'=>'document', 'groups'=>array('document')),
+        'bdoc' => array ('type'=>'application/x-digidoc', 'icon'=>'document', 'groups'=>array('archive')),
+        'cdoc' => array ('type'=>'application/x-digidoc', 'icon'=>'document', 'groups'=>array('archive')),
+        'ddoc' => array ('type'=>'application/x-digidoc', 'icon'=>'document', 'groups'=>array('archive')),
         'docx' => array ('type'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'icon'=>'document', 'groups'=>array('document')),
         'docm' => array ('type'=>'application/vnd.ms-word.document.macroEnabled.12', 'icon'=>'document'),
         'dotx' => array ('type'=>'application/vnd.openxmlformats-officedocument.wordprocessingml.template', 'icon'=>'document'),
diff --git a/version.php b/version.php
index 813522e6a1f..e38f9a6f5d4 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2014042400.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2014043000.00;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.