diff --git a/includes/MediaFlickrStreamWrapper.inc b/includes/MediaFlickrStreamWrapper.inc
index bd84026059de601c7dac4b3f0b33dabf75044ba3..f8d8ee6517577231a7c2a5a0992b7f40b11a4bad 100644
--- a/includes/MediaFlickrStreamWrapper.inc
+++ b/includes/MediaFlickrStreamWrapper.inc
@@ -10,7 +10,7 @@
  *  $flickr = new MediaFlickrStreamWrapper('flickr://u/[user-code]/p/[photo-code]');
  */
 class MediaFlickrStreamWrapper extends MediaReadOnlyStreamWrapper {
-  protected $base_url = 'http://www.flickr.com/';
+  protected $base_url = 'https://www.flickr.com/';
   protected $parameters = array('u' => NULL, 'p' => NULL, 's' => NULL, 'search' => NULL);
 
   function interpolateUrl() {
diff --git a/includes/MediaInternetFlickrHandler.inc b/includes/MediaInternetFlickrHandler.inc
index 22a0223a2a1746a68f30d544b5631eeaa6d03b59..869639cff247e59f8db3c7efc940f142282b97b4 100644
--- a/includes/MediaInternetFlickrHandler.inc
+++ b/includes/MediaInternetFlickrHandler.inc
@@ -46,7 +46,7 @@ class MediaInternetFlickrHandler extends MediaInternetBaseHandler {
   public function getOEmbed() {
     $uri = $this->parse($this->embedCode);
     $external_url = drupal_realpath($uri);
-    $oembed_url = url('http://www.flickr.com/services/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
+    $oembed_url = url('https://www.flickr.com/services/oembed', array('query' => array('url' => $external_url, 'format' => 'json')));
     $response = drupal_http_request($oembed_url);
 
     if (!isset($response->error)) {
diff --git a/media_flickr.module b/media_flickr.module
index 8eeedb937415a5ebbaf1b2812e39ec2b8e7b855b..39c2cb2851ce436f553132fb508114341465c3a2 100644
--- a/media_flickr.module
+++ b/media_flickr.module
@@ -7,8 +7,7 @@
  */
 
 define('MEDIA_FLICKR_RESTPOINT', 'https://api.flickr.com/services/rest/');
-define('MEDIA_FLICKR_API_APPLICATION_URL', 'http://www.flickr.com/services/api/keys');
-define('MEDIA_FLICKR_MAIN_URL', 'http://www.flickr.com/');
+define('MEDIA_FLICKR_API_APPLICATION_URL', 'https://www.flickr.com/services/api/keys');
 
 // Load all Flickr file formatters.
 require_once dirname(__FILE__) . '/includes/media_flickr.formatters.inc';
diff --git a/themes/media-flickr-photoset.tpl.php b/themes/media-flickr-photoset.tpl.php
index 97782c55ebefd1ada2307501cc1d24f9659d8382..981bc3c56902dadc10dc64d9ade260aa47c84120 100644
--- a/themes/media-flickr-photoset.tpl.php
+++ b/themes/media-flickr-photoset.tpl.php
@@ -9,11 +9,11 @@
 <object width="<?php print $width; ?>" height="<?php print $height; ?>">
   <param name="flashvars" value="<?php print $flashvars; ?>"></param>
   <param name="movie"
-    value="http://www.flickr.com/apps/slideshow/show.swf?v=104087">
+    value="https://www.flickr.com/apps/slideshow/show.swf?v=104087">
   </param>
   <param name="allowFullScreen" value="true"></param>
   <embed type="application/x-shockwave-flash"
-    src="http://www.flickr.com/apps/slideshow/show.swf?v=104087"
+    src="https://www.flickr.com/apps/slideshow/show.swf?v=104087"
     allowFullScreen="true"
     flashvars="<?php print $flashvars; ?>"
     width="<?php print $width; ?>"