diff --git a/drupal_commons.make b/drupal_commons.make
index dd4a498..2f604bd 100644
--- a/drupal_commons.make
+++ b/drupal_commons.make
@@ -314,6 +314,12 @@ projects[digests][download][revision] = "6.x-1.x"
 projects[digests][type] = "module"
 projects[digests][subdir] = "contrib"
 
+projects[tidy_node_links][download][type] = "git"
+projects[tidy_node_links][download][url] = "http://git.drupal.org/sandbox/ezrag/1344006.git"
+projects[tidy_node_links][download][revision] = "6.x-1.x"
+projects[tidy_node_links][type] = "module"
+projects[tidy_node_links][subdir] = "contrib"
+
 projects[facebook_status][download][type] = "git"
 projects[facebook_status][download][url] = "http://git.drupal.org/project/facebook_status.git"
 projects[facebook_status][download][revision] = "6.x-3.x"
diff --git a/drupal_commons.profile b/drupal_commons.profile
index 405ff57..681c611 100644
--- a/drupal_commons.profile
+++ b/drupal_commons.profile
@@ -144,7 +144,8 @@ function drupal_commons_profile_tasks(&$task, $url) {
     $operations[] = array('drupal_commons_config_views', array());
     $operations[] = array('drupal_commons_config_images', array());
     $operations[] = array('drupal_commons_config_vars', array());
-  
+    $operations[] = array('drupal_commons_config_tidy_node_links', array());
+
     // Build the batch process
     $batch = array(
       'operations' => $operations,
@@ -460,6 +461,18 @@ function drupal_commons_config_vars() {
 }
 
 /**
+ * Configure tidy node links
+ */
+function drupal_commons_config_tidy_node_links() {
+  $theme = variable_get('theme_default','garland');
+  if ($theme=='commons_origins') {
+    drupal_install_modules(array('tidy_node_links'));
+  }
+}
+
+
+
+/**
  * Create an initial group with a discussion
  */
 function drupal_commons_create_group() {
diff --git a/modules/features/commons_core/commons_core.install b/modules/features/commons_core/commons_core.install
index ac2fb77..572ef7e 100644
--- a/modules/features/commons_core/commons_core.install
+++ b/modules/features/commons_core/commons_core.install
@@ -401,4 +401,17 @@ function commons_core_update_6013() {
 function commons_core_update_6014() {
   module_disable(array('commons_release'));
   drupal_uninstall_module('commons_release');
-}
\ No newline at end of file
+}
+
+
+/**
+ * Install tidy_node_links module
+ */
+function commons_core_update_6015() {
+  $theme = variable_get('theme_default','garland');
+  if ($theme=='commons_origins') {
+    drupal_install_modules(array('tidy_node_links'));
+  }
+  return array();
+}
+