diff --git a/modules/local_fonts/local_fonts.install b/modules/local_fonts/local_fonts.install
index 9c81d48..666b943 100644
--- a/modules/local_fonts/local_fonts.install
+++ b/modules/local_fonts/local_fonts.install
@@ -29,3 +29,39 @@ function local_fonts_disable() {
   fontyourface_provider_disable('local_fonts');
 
 } // local_fonts_disable
+
+/**
+ * Update local fonts metadata.
+ */
+function local_fonts_update_7200() {
+  $fonts = fontyourface_get_fonts($where = "provider = 'local_fonts'");
+  if (!$fonts) {
+    return NULL;
+  }
+  foreach ($fonts as $font) {
+    $metadata = unserialize($font->metadata);
+    if (isset($metadata['font_uri'])) {
+      unset($metadata['font_uri']);
+    }
+    $dirname = drupal_dirname($metadata['path']);
+    if ($handle = opendir($dirname)) {
+      while ($file_name = readdir($handle)) {
+        if (preg_match("/\.ttf/i", $file_name) == 1) {
+          $metadata['font_uri']['truetype'] = $dirname . '/' . $file_name;
+        }
+        if (preg_match("/\.eot/i", $file_name) == 1) {
+          $metadata['font_uri']['eot'] = $dirname . '/' . $file_name;
+        }
+        if (preg_match("/\.woff/i", $file_name) == 1) {
+          $metadata['font_uri']['woff'] = $dirname . '/' . $file_name;
+        }
+        if (preg_match("/\.svg/i", $file_name) == 1) {
+          $metadata['font_uri']['svg'] = $dirname . '/' . $file_name;
+        }
+      }
+      closedir($handle);
+    }
+    $font->metadata = serialize($metadata);
+    fontyourface_save_font($font);
+  }
+}
diff --git a/modules/local_fonts/local_fonts.module b/modules/local_fonts/local_fonts.module
index 9237bd9..6fb2e65 100644
--- a/modules/local_fonts/local_fonts.module
+++ b/modules/local_fonts/local_fonts.module
@@ -233,10 +233,10 @@ function local_fonts_add_form_validate($form, &$form_state) {
  */
 function local_fonts_add_form_submit($form, &$form_state) {
 
-	$stream_wrappers = file_get_stream_wrappers();
-	if($stream_wrappers['public']) {
-		$scheme = 'public';
-	}
+  $stream_wrappers = file_get_stream_wrappers();
+  if($stream_wrappers['public']) {
+    $scheme = 'public';
+  }
 
   $values = $form_state['values'];
   $font_path = strtr(preg_replace('#[^a-zA-Z0-9]+#', ' ', $values['css_family']), ' ', '_') . '-' . $values['css_style'] . '-' . $values['css_weight'];
@@ -246,7 +246,7 @@ function local_fonts_add_form_submit($form, &$form_state) {
   $local_fonts_directory = dirname($_SERVER['SCRIPT_FILENAME']) . '/' . file_stream_wrapper_get_instance_by_scheme('public')->getDirectoryPath() . '/fontyourface/local_fonts';
   $destination_directory = $local_fonts_directory . '/' . $font_path;
 
-	$validators['file_validate_extensions'][] = 'eot ttf svg woff css';
+  $validators['file_validate_extensions'][] = 'eot ttf svg woff css';
 
   $files = $_FILES['files']['name'];
 
@@ -258,8 +258,9 @@ function local_fonts_add_form_submit($form, &$form_state) {
     (file_prepare_directory($destination_directory, FILE_CREATE_DIRECTORY))
   ) {
 
-  	$destination_directory = $scheme . '://' . 'fontyourface/local_fonts/' . $font_path;
-  	$destination_css_file = $destination_directory . '/stylesheet.css';
+    $destination_directory = $scheme . '://' . 'fontyourface/local_fonts/' . $font_path;
+    $destination_css_file = $destination_directory . '/stylesheet.css';
+    $destination_font_files = array();
 
     foreach ($files as $key => $filename) {
 
@@ -279,6 +280,7 @@ function local_fonts_add_form_submit($form, &$form_state) {
 
             $file->status = FILE_STATUS_PERMANENT;
             $file = file_save($file);
+            $destination_font_files[$format] = $destination_directory . '/' . $file->filename;
 
             if ($format == 'eot') {
 
@@ -345,8 +347,13 @@ function local_fonts_add_form_submit($form, &$form_state) {
     $local_font->css_style = $font_style;
     $local_font->css_weight = $font_weight;
     $local_font->provider = 'local_fonts';
-    $local_font->metadata = serialize(array('path' => $destination_css_file));
-		$local_font->tags = array();
+    $local_font->metadata = serialize(
+      array(
+        'path' => $destination_css_file,
+        'font_uri' => $destination_font_files,
+      )
+    );
+    $local_font->tags = array();
 
     fontyourface_save_font($local_font);