diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e56fb0..25ca1ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 ### HEAD
+* Change media directory from `/assets/` to `/media/`
 * Update to Bootstrap 2.3.2
 * Update to Google Universal Analytics
 * Update to jQuery 1.10.1
diff --git a/doc/activation.md b/doc/activation.md
index c8d6dfc..98df24f 100644
--- a/doc/activation.md
+++ b/doc/activation.md
@@ -17,7 +17,7 @@ Change permalink structure to `/%postname%/`. This is normally handled from the
 
 ### Change uploads folder
 
-Change uploads folder to `/assets/` instead of `/wp-content/uploads/`. This is normally handled from the Media settings.
+Change uploads folder to `/media/` instead of `/wp-content/uploads/`.
 
 ### Create navigation menu
 
diff --git a/lib/activation.php b/lib/activation.php
index 63807ef..d028525 100644
--- a/lib/activation.php
+++ b/lib/activation.php
@@ -93,7 +93,7 @@ function roots_theme_activation_options_render_page() { ?>
                 <option value="false"><?php echo _e('No', 'roots'); ?></option>
               </select>
               <br>
-              <small class="description"><?php printf(__('Change uploads folder to /assets/ instead of /wp-content/uploads/', 'roots')); ?></small>
+              <small class="description"><?php printf(__('Change uploads folder to /media/ instead of /wp-content/uploads/', 'roots')); ?></small>
             </fieldset>
           </td>
         </tr>
@@ -191,7 +191,7 @@ function roots_theme_activation_action() {
 
     update_option('uploads_use_yearmonth_folders', 0);
     if (!is_multisite()) {
-      update_option('upload_path', 'assets');
+      update_option('upload_path', 'media');
     } else {
       update_option('upload_path', '');
     }