diff --git a/media.inc b/media.inc
index 53c10ec..276a75d 100644
--- a/media.inc
+++ b/media.inc
@@ -139,6 +139,51 @@ class MigrateExtrasFileYoutube implements MigrateFileInterface {
   }
 }
 
+/**
+ * Class for creating Flickr file entities.
+ */
+class MigrateExtrasFileFlickr implements MigrateFileInterface {
+  /**
+   * Implementation of MigrateFileInterface::fields().
+   *
+   * @return array
+   */
+  static public function fields() {
+    return array();
+  }
+
+  /**
+   * Implementation of MigrateFileInterface::processFiles().
+   *
+   * @param $value
+   *  The URI or local filespec of a file to be imported.
+   * @param $owner
+   *  User ID (uid) to be the owner of the file.
+   * @return object
+   *  The file entity being created or referenced.
+   */
+  public function processFile($value, $owner) {
+    // Convert the Youtube URI into a local stream wrapper.
+    $handler = new MediaInternetFlickrHandler($value);
+    $destination = $handler->parse($value);
+    
+    // Create a file entity object for this flickr reference, and see if we
+    // can get the video title.
+    $file = file_uri_to_object($destination, TRUE);
+    // oembed not implemented yet. See http://www.oembed.com/.
+    //if (empty($file->fid) && $info = $handler->getOEmbed()) {
+    //  $file->filename = truncate_utf8($info['title'], 255);
+    //}
+    $file = file_save($file);
+    if (is_object($file)) {
+      return $file;
+    }
+    else {
+      return FALSE;
+    }
+  }
+}
+
 // Basic support for the deprecated media field type.
 class MigrateMediaFieldHandler extends MigrateFileFieldHandler {
   public function __construct() {