diff --git a/field/flickrfield.module b/field/flickrfield.module
index d8661c2..2e4f1f3 100644
--- a/field/flickrfield.module
+++ b/field/flickrfield.module
@@ -221,7 +221,7 @@ function flickrfield_field_formatter_info() {
     );
   }
   $formatters['photoset_flickrcomslideshow'] = array(
-    'label' => 'Embedded Flickr.com flash slideshow',
+    'label' => 'Embedded Flickr.com slideshow',
     'field types' => array('flickrfield_photoset'),
   );
   $formatters['photoset_flickrcomsetlink'] = array(
@@ -391,7 +391,7 @@ function theme_flickrfield_formatter_photoset_primaryphoto($element) {
 }
 
 /**
- * Theme a Flickr photo set as an embedded Flickr.com flash slideshow.
+ * Theme a Flickr photo set as an embedded Flickr.com slideshow.
  */
 function theme_flickrfield_formatter_photoset_flickrcomslideshow($variables) {
   require_once DRUPAL_ROOT . '/' . drupal_get_path('module', 'flickr') . '/flickr.inc';
@@ -399,9 +399,11 @@ function theme_flickrfield_formatter_photoset_flickrcomslideshow($variables) {
     return;
   }
   $set_id = $variables['#item']['flickrid'];
-  $src = 'https://www.flickr.com/slideShow/index.gne?set_id=' . $set_id;
+  $info = flickr_photoset_get_info($set_id);
+  $user_id = $info['owner'];
+  $src = 'http://www.flickr.com/slideShow/index.gne?group_id=&user_id=' . $user_id . '&set_id=' . $set_id . '&text=';
   return '<div class="flickr-photoset-slideshow">'
-    . '<iframe align="center" src="' . $src . '" frameBorder="0" width="500" scrolling="no" height="500"></iframe>'
+    . '<object type="text/html" data="' . $src . '" width="500" height="500"></object>'
     . '</div>';
 }