diff --git a/cambridge.info b/cambridge.info
index efb90dd73823f6975f6c46b20941daa1c42c05c3..730f65ad536a59d77fb3d57ef9310e97aad57685 100644
--- a/cambridge.info
+++ b/cambridge.info
@@ -37,6 +37,7 @@ dependencies[] = ckeditor
 dependencies[] = date
 dependencies[] = imagecrop
 dependencies[] = link
+dependencies[] = media
 dependencies[] = pathauto
 dependencies[] = php
 dependencies[] = raven
diff --git a/cambridge.install b/cambridge.install
index 19caed39622d3bffa1b046aed06dc557f7235942..8f4727cf3aff5056d9f7ba88b6d9a789b4ed082a 100644
--- a/cambridge.install
+++ b/cambridge.install
@@ -19,7 +19,7 @@ function cambridge_install() {
 
   // Set some sensible defaults for the Image javascript crop module.
 
-  variable_set('imagecrop_popup', 'imagecrop_iframe');
+  variable_set('imagecrop_popup', 'imagecrop_popup');
   variable_set('imagecrop_scale_default', 1);
   variable_set('imagecrop_show_cancel_button', 1);
   variable_set('imagecrop_ui_controls', 1);
@@ -102,4 +102,18 @@ function cambridge_install() {
       'weight' => 0,
     )
   );
+
+  // Use the media module for image field instances.
+
+  $instances = array(
+    field_read_instance('node', 'field_leading_image', 'page'),
+    field_read_instance('node', 'field_carousel_image', 'carousel_item'),
+  );
+
+  foreach ($instances as $instance) {
+    $instance['widget']['type'] = 'media_generic';
+    $instance['widget']['module'] = 'media';
+
+    field_update_instance($instance);
+  }
 }
diff --git a/cambridge.make b/cambridge.make
index 23c513545deac24078053819ee48a41e11ef6d43..6303fe5345598b5ea2b9de17a436989794e04b8d 100644
--- a/cambridge.make
+++ b/cambridge.make
@@ -16,3 +16,4 @@ projects[date] = "2.6"
 projects[easy_breadcrumb] = "2.7"
 projects[google_analytics] = "1.3"
 projects[imagecrop] = "1.0-rc3"
+projects[media] = "1.3"