diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 23e04573485afc6b2bc947d33a547457a1f6893a..37c3c14a72ffda9bbd62b71aa7790da477f8e55a 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
 
 Wysiwyg 5.x-2.x, xxxx-xx-xx
 ---------------------------
+#485264 by sun: Changed installation instructions to be more concise.
 #479514 by sun: Fixed native plugin loading for TinyMCE (follow-up).
 #434590 by sun: Fixed path admin/settings/wysiwyg not found.
 #479514 by TwoD, sun: Added native plugin support for FCKeditor.
diff --git a/wysiwyg.admin.inc b/wysiwyg.admin.inc
index b53c7445168a681af9f38aaf5d7e58b37408e8b5..29c080a0eba7dd9434b6e7b318921a49e044e16c 100644
--- a/wysiwyg.admin.inc
+++ b/wysiwyg.admin.inc
@@ -364,25 +364,44 @@ function wysiwyg_profile_overview() {
   $count = count($editors);
   $status = array();
   $options = array('' => t('No editor'));
-  foreach ($editors as $editor => $properties) {
-    $status[$editor] = array(
-      'severity' => (isset($properties['error']) ? REQUIREMENT_ERROR : ($properties['installed'] ? REQUIREMENT_OK : REQUIREMENT_INFO)),
-      'title' => t('<a href="!vendor-url">@editor</a> (<a href="!download-url">Download</a>)', array('!vendor-url' => $properties['vendor url'], '@editor' => $properties['title'], '!download-url' => $properties['download url'])),
-      'value' => (isset($properties['installed version']) ? $properties['installed version'] : t('Not installed.')),
-      'description' => (isset($properties['error']) ? $properties['error'] : ($properties['installed'] ? '' : t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', array('@editor-path' => $properties['editor path'])))),
+
+  foreach ($editors as $name => $editor) {
+    $status[$name] = array(
+      'severity' => (isset($editor['error']) ? REQUIREMENT_ERROR : ($editor['installed'] ? REQUIREMENT_OK : REQUIREMENT_INFO)),
+      'title' => t('<a href="!vendor-url">@editor</a> (<a href="!download-url">Download</a>)', array('!vendor-url' => $editor['vendor url'], '@editor' => $editor['title'], '!download-url' => $editor['download url'])),
+      'value' => (isset($editor['installed version']) ? $editor['installed version'] : t('Not installed.')),
+      'description' => (isset($editor['error']) ? $editor['error'] : ''),
     );
-    if ($properties['installed']) {
-      $options[$editor] = $properties['title'] . (isset($properties['installed version']) ? ' ' . $properties['installed version'] : '');
+    if ($editor['installed']) {
+      $options[$name] = $editor['title'] . (isset($editor['installed version']) ? ' ' . $editor['installed version'] : '');
     }
     else {
+      // Build on-site installation instructions.
+      // @todo Setup $library in wysiwyg_load_editor() already.
+      $library = (isset($editor['library']) ? $editor['library'] : key($editor['libraries']));
+      $targs = array(
+        '@editor-path' => $editor['editor path'],
+        '@library-filepath' => $editor['library path'] . '/' . $editor['libraries'][$library]['files'][0],
+      );
+      $instructions = '<p>' . t('Extract the archive and copy its contents into a new folder in the following location:<br /><code>@editor-path</code>', $targs) . '</p>';
+      $instructions .= '<p>' . t('So the actual library can be found at:<br /><code>@library-filepath</code>', $targs) . '</p>';
+
+      $status[$name]['description'] .= $instructions;
       $count--;
     }
+    // In case there is an error, always show installation instructions.
+    if (isset($editor['error'])) {
+      $show_instructions = TRUE;
+    }
+  }
+  if (!$count) {
+    $show_instructions = TRUE;
   }
   $form['status'] = array(
     '#type' => 'fieldset',
     '#title' => t('Installation instructions'),
     '#collapsible' => TRUE,
-    '#collapsed' => $count,
+    '#collapsed' => !isset($show_instructions),
     '#description' => (!$count ? t('There are no editor libraries installed currently. The following list contains a list of currently supported editors:') : ''),
     '#weight' => 10,
   );