diff --git a/lib/Drupal/configuration/Config/Configuration.php b/lib/Drupal/configuration/Config/Configuration.php
index 853bbce..414f391 100644
--- a/lib/Drupal/configuration/Config/Configuration.php
+++ b/lib/Drupal/configuration/Config/Configuration.php
@@ -699,9 +699,7 @@ class Configuration {
    * @param  ConfigIteratorSettings $settings
    * @see iterate()
    */
-  protected function printRaw(ConfigIteratorSettings &$settings) {
-    $this->build();
-
+  public function raw() {
     // Save the configuration into a file.
     $file_content = $this->storage
                       ->setData($this->data)
@@ -710,6 +708,19 @@ class Configuration {
                       ->setOptionalConfigurations(drupal_map_assoc(array_keys($this->getOptionalConfigurations())))
                       ->setModules(array_keys($this->getRequiredModules()))
                       ->getDataToSave();
+    return $file_content;
+  }
+
+  /**
+   * Print the configuration as plain text formatted to use in a tar file.
+   *
+   * @param  ConfigIteratorSettings $settings
+   * @see iterate()
+   */
+  protected function printRaw(ConfigIteratorSettings &$settings) {
+    $this->build();
+
+    $file_content = $this->raw();
 
     $this->buildHash();
     $settings->addInfo('hash', $this->getHash());
diff --git a/ui/configuration_ui.admin.inc b/ui/configuration_ui.admin.inc
index cbc536e..c459ba3 100644
--- a/ui/configuration_ui.admin.inc
+++ b/ui/configuration_ui.admin.inc
@@ -204,12 +204,22 @@ function configuration_ui_notracking_form($form, &$form_state) {
  * Menu Callback Form.
  */
 function configuration_ui_config_info($config_id) {
+  static $diff_exists;
+
+  if (!isset($diff_exists)) {
+    $diff_exists = module_exists('diff');
+  }
+
   $config = ConfigurationManagement::createConfigurationInstance($config_id);
 
   $config->loadFromActiveStore();
 
+  $status = check_plain($config->getStatus());
+  if ($diff_exists && $status != t('In Sync')) {
+    $status = l(check_plain($status), 'admin/config/configuration/diff/' . arg(4), array('attributes' => array('title' => t('View differences'))));
+  }
   if (arg(5) == 'status') {
-    print $config->getStatus();
+    print $status;
     exit();
   }
 
@@ -217,7 +227,8 @@ function configuration_ui_config_info($config_id) {
 
   $page .= '<h2>' . t('Configuration for: @config', array('@config' => $config->getUniqueID())) . '</h2>';
   $page .= '<p>' . t('Hash: @hash', array('@hash' => $config->getHash())) . '</p>';
-  $page .= '<p>' . t('Status: <strong>@status</strong>', array('@status' => $config->getStatus())) . '</p>';
+
+  $page .= '<p>' . t('Status: <strong>!status</strong>', array('!status' => $status)) . '</p>';
 
   $page .= '<p>' . t('Dependencies:') . '</p>';
   $dependencies = array('items' => array_keys($config->getDependencies()));
@@ -231,6 +242,39 @@ function configuration_ui_config_info($config_id) {
 }
 
 /**
+ * Menu Callback Form.
+ */
+function configuration_ui_config_diff($config_id) {
+  $activestore = ConfigurationManagement::createConfigurationInstance($config_id);
+  $datastore = ConfigurationManagement::createConfigurationInstance($config_id);
+
+  drupal_add_css(drupal_get_path('module', 'configuration_ui') . '/theme/configuration.css');
+
+  $output = '';
+
+  module_load_include('inc', 'diff', 'diff.engine');
+  $formatter = new DrupalDiffFormatter();
+
+  $formatter->leading_context_lines = 2;
+  $formatter->trailing_context_lines = 2;
+
+  $rows[] = array();
+
+  $rows[] = array(array(array('data' => 'test', 'colspan' => 4, 'header' => TRUE)));
+  $diff = new Diff(explode("\n", $datastore->loadFromStorage()->raw()), explode("\n", $activestore->loadFromActiveStore()->raw()));
+  $rows = array_merge($rows, $formatter->format($diff));
+
+  $header = array(
+    array('data' => t('Datastore'), 'colspan' => 2),
+    array('data' => t('Activestore'), 'colspan' => 2),
+  );
+  $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('diff', 'configuration-diff'))));
+
+  $output = array('page' => array('#markup' => "<div class='configuration-comparison'>{$output}</div>"));
+  return $output;
+}
+
+/**
  * Submit handler for reverting configs.
  */
 function configuration_ui_activate_form_submit($form, &$form_state) {
diff --git a/ui/configuration_ui.module b/ui/configuration_ui.module
index 1531e4a..5700e49 100644
--- a/ui/configuration_ui.module
+++ b/ui/configuration_ui.module
@@ -73,6 +73,16 @@ function configuration_ui_menu() {
     'access arguments' => array('administer configuration management'),
   );
 
+  if (module_exists('diff')) {
+    $items['admin/config/configuration/diff/%'] = array(
+      'title' => 'Configuration Management',
+      'page callback' => 'configuration_ui_config_diff',
+      'page arguments' => array(4),
+      'file' => 'configuration_ui.admin.inc',
+      'access arguments' => array('administer configuration management'),
+    );
+  }
+
   $items['admin/config/system/configuration/migrate'] = array(
     'title' => 'Migrate',
     'page callback' => 'drupal_get_form',
