diff --git a/includes/media_flickr.utilities.inc b/includes/media_flickr.utilities.inc
index 4b6923c34c412675352da6f179007f9b50270c46..177e774bdd45de9e24c39f022be36caa805e20fc 100644
--- a/includes/media_flickr.utilities.inc
+++ b/includes/media_flickr.utilities.inc
@@ -212,6 +212,16 @@ function _media_flickr_build_uri($parts) {
   }
 }
 
+/**
+ * Flickr media parse helper function. Search the original url for valid data.
+ *
+ * @param $url
+ *   The original URL or embed code to parse.
+ * @param array $options
+ *
+ * @return string
+ *   The unique URI for the file, based on its stream wrapper, or NULL.
+ */
 function _media_flickr_media_parse($url, $options = array()) {
   // The following are single images.
   $patterns = array(
@@ -226,9 +236,10 @@ function _media_flickr_media_parse($url, $options = array()) {
       return _media_flickr_build_uri(array('u' => $matches[1], 'p' => $matches[2]));
     }
   }
-  // Next we look for photosets.
+  // Next we look for photosets/albums.
   $patterns = array(
     '@flickr\.com/photos/([0-9A-Za-z\@\&\$_-]+)/sets/([0-9]+)@i',
+    '@flickr\.com/photos/([0-9A-Za-z\@\&\$_-]+)/albums/([0-9]+)@i',
   );
   foreach ($patterns as $pattern) {
     preg_match($pattern, $url, $matches);