diff --git a/platform/drupal/deploy_7.inc b/platform/drupal/deploy_7.inc
index fd4ec25..9e38179 100644
--- a/platform/drupal/deploy_7.inc
+++ b/platform/drupal/deploy_7.inc
@@ -1,7 +1,15 @@
 <?php
 
+/**
+ * @file
+ *
+ * Update paths inside database content for sites cloned/migrated/renamed.
+ */
+
 $new_url = drush_get_option('uri');
 $old_url = drush_get_option('old_uri');
+//$old_url_pattern = '/^' . preg_quote('sites/' . $old_url, '/') . '/';
+$old_url_pattern_short = '/' . preg_quote($old_url) . '/';
 
 /**
  * @file
@@ -11,12 +19,27 @@ $old_url = drush_get_option('old_uri');
  */
 
 if ($new_url != $old_url) {
+  $url_changed  = TRUE;
+}
+
+if ($url_changed) {
+  db_query("UPDATE {block_custom}       SET body       = REPLACE(body,       'sites/%s', 'sites/%s')", array($old_url, $new_url));
+
+  // TODO get Field API to tell us all text fields and loop over the tables ?
+  db_query("UPDATE {field_data_body} SET body_value       = REPLACE(body_value,   'sites/%s', 'sites/%s')", array($old_url, $new_url));
+  db_query("UPDATE {field_data_body} SET body_summary     = REPLACE(body_summary, 'sites/%s', 'sites/%s')", array($old_url, $new_url));
+  db_query("UPDATE {field_revision_body} SET body_value   = REPLACE(body_value,   'sites/%s', 'sites/%s')", array($old_url, $new_url));
+  db_query("UPDATE {field_revision_body} SET body_summary = REPLACE(body_summary, 'sites/%s', 'sites/%s')", array($old_url, $new_url));
+
+  db_query("UPDATE {system}          SET filename         = REPLACE(filename,     'sites/%s', 'sites/%s')", array($old_url, $new_url));
+
+  // Is the URI in the site_name?
+  $site_name = variable_get('site_name');
+  if (preg_match($old_url_pattern_short, $site_name)) {
+    variable_set('site_name', preg_replace($old_url_pattern_short, $new_url, $site_name));
+  }
+
   drush_log(
     dt('Changed paths from sites/@old_url to sites/@new_url',
     array('@old_url' => $old_url, '@new_url' => $new_url)));
 }
-
-variable_set('file_public_path', "sites/$new_url/files");
-variable_set('file_private_path', "sites/$new_url/private/files");
-variable_set('file_temporary_path', "sites/$new_url/private/temp");
-