diff --git a/core/lib/Drupal/Core/File/File.php b/core/lib/Drupal/Core/File/File.php
index 62e03a0..b35f5ee 100644
--- a/core/lib/Drupal/Core/File/File.php
+++ b/core/lib/Drupal/Core/File/File.php
@@ -62,7 +62,7 @@ class File extends Entity {
   /**
    * The size of the file in bytes.
    *
-   * @var string
+   * @var integer
    */
   public $filesize;
 
@@ -78,7 +78,7 @@ class File extends Entity {
   public $status;
 
   /**
-   * UNIX timestamp for when the file was added.
+   * UNIX timestamp for when the file was last saved.
    *
    * @var integer
    */
diff --git a/core/lib/Drupal/Core/File/FileStorageController.php b/core/lib/Drupal/Core/File/FileStorageController.php
index 9fa9e5b..e569344 100644
--- a/core/lib/Drupal/Core/File/FileStorageController.php
+++ b/core/lib/Drupal/Core/File/FileStorageController.php
@@ -19,7 +19,6 @@ class FileStorageController extends EntityDatabaseStorageController {
    * Overrides Drupal\entity\EntityDatabaseStorageController::create().
    */
   public function create(array $values) {
-
     // Automatically detect filename if not set.
     if (!isset($values['filename']) && isset($values['uri'])) {
       $values['filename'] = drupal_basename($values['uri']);
@@ -38,6 +37,13 @@ class FileStorageController extends EntityDatabaseStorageController {
   protected function preSave(EntityInterface $entity) {
     $entity->timestamp = REQUEST_TIME;
     $entity->filesize = filesize($entity->uri);
+    if (!isset($entity->langcode)) {
+      // Default the file's language code to none, because files are language
+      // neutral more often than language dependent. Until we have better flexible
+      // settings.
+      // @todo See http://drupal.org/node/258785 and followups.
+      $entity->langcode = LANGUAGE_NOT_SPECIFIED;
+    }
   }
 
   /**