diff --git a/all/modules/contrib/addresses/addresses_cck/CVS/Entries b/all/modules/contrib/addresses/addresses_cck/CVS/Entries
deleted file mode 100755
index dc1403a..0000000
--- a/all/modules/contrib/addresses/addresses_cck/CVS/Entries
+++ /dev/null
@@ -1,5 +0,0 @@
-/addresses_cck.inc/1.5/Sat Jul 17 23:03:19 2010//TDRUPAL-6--1-10
-/addresses_cck.info/1.2/Fri Jul  9 06:48:19 2010//TDRUPAL-6--1-10
-/addresses_cck.install/1.1/Fri Jan  9 07:12:50 2009//TDRUPAL-6--1-10
-/addresses_cck.module/1.21/Sat Oct 23 21:00:40 2010//TDRUPAL-6--1-10
-D/translations////
diff --git a/all/modules/contrib/addresses/addresses_cck/CVS/Repository b/all/modules/contrib/addresses/addresses_cck/CVS/Repository
deleted file mode 100755
index 33c628d..0000000
--- a/all/modules/contrib/addresses/addresses_cck/CVS/Repository
+++ /dev/null
@@ -1 +0,0 @@
-contributions/modules/addresses/addresses_cck
diff --git a/all/modules/contrib/addresses/addresses_cck/CVS/Root b/all/modules/contrib/addresses/addresses_cck/CVS/Root
deleted file mode 100755
index 10a763f..0000000
--- a/all/modules/contrib/addresses/addresses_cck/CVS/Root
+++ /dev/null
@@ -1 +0,0 @@
-:pserver:anonymous@cvs.drupal.org:/cvs/drupal
diff --git a/all/modules/contrib/addresses/addresses_cck/CVS/Tag b/all/modules/contrib/addresses/addresses_cck/CVS/Tag
deleted file mode 100755
index 557b590..0000000
--- a/all/modules/contrib/addresses/addresses_cck/CVS/Tag
+++ /dev/null
@@ -1 +0,0 @@
-NDRUPAL-6--1-10
diff --git a/all/modules/contrib/addresses/addresses_cck/addresses_cck.module b/all/modules/contrib/addresses/addresses_cck/addresses_cck.module
index cdfbb2e..2b7babf 100755
--- a/all/modules/contrib/addresses/addresses_cck/addresses_cck.module
+++ b/all/modules/contrib/addresses/addresses_cck/addresses_cck.module
@@ -295,4 +295,61 @@ function addresses_cck_widget_info() {
   );
 }
 
+/**
+ * Implementation of hook_token_list().
+ */
+function addresses_cck_token_list($type = 'all') {
+  if ($type == 'field' || $type == 'all') {
+    $tokens = array();
+
+    $fields = module_invoke_all('addressesfieldapi', 'fields');
+
+    foreach ($fields as $field => $field_data) {
+      if (isset($field_data['theme'])) {
+
+        foreach ($field_data['theme'] as $theme => $theme_title) {
+          $tokens['addresses'][$field .'_'. $theme] = $theme_title;
+        }
+      }
+    }
+    return $tokens;
+  }
+}
+/**
+ * Implementation of hook_token_values().
+ */
+function addresses_cck_token_values($type, $object = NULL) {
+  if ($type == 'field') {
+    $tokens = array();
+    $item = $object[0];
+
+    $fields = module_invoke_all('addressesfieldapi', 'fields');
+
+    foreach ($fields as $field => $field_data) {
+      if (isset($field_data['theme'])) {
+        foreach (array_keys($field_data['theme']) as $format) {
+          // Sub-modules such as addresses_phone add a module specification to
+          // avoid clashes between modules.
+          if (!empty($field_data['module'])) {
+            $module = $field_data['module'] . '_';
+          }
+          else {
+            $module = '';
+          }
+
+          if (isset($field_data['theme'])) {
+
+            foreach ($field_data['theme'] as $theme => $theme_title) {
+              $tokens[$field .'_'. $theme] = theme('addresses_'. $module . $field, $item, $format);
+            }
+          }
+
+        }
+      }
+    }
+
+    return $tokens;
+  }
+}
+
 // vim: ts=2 sw=2 et syntax=php