Index: nodewords_basic/includes/nodewords_basic.nodewords.tags.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_basic/includes/Attic/nodewords_basic.nodewords.tags.inc,v
retrieving revision 1.1.2.14
diff -u -p -r1.1.2.14 nodewords_basic.nodewords.tags.inc
--- nodewords_basic/includes/nodewords_basic.nodewords.tags.inc	1 Nov 2010 07:14:31 -0000	1.1.2.14
+++ nodewords_basic/includes/nodewords_basic.nodewords.tags.inc	1 Nov 2010 13:08:30 -0000
@@ -69,11 +69,13 @@ function nodewords_basic_canonical_form_
  */
 function nodewords_basic_canonical_prepare(&$tags, $content, $options) {
   if (!empty($content['value'])) {
-    $tags['canonical'] = check_url(
-      nodewords_url(
-        trim(nodewords_replace_tokens($content['value'], $options), '/'), $options
-      )
-    );
+    $path = nodewords_replace_tokens($content['value'], $options);
+    // The homepage will always be a directory / site root, so it should not
+    // have the trailing slash removed.
+    if ($content['value'] != '[site-url]') {
+      $path = trim($path, '/');
+    }
+    $tags['canonical'] = check_url(nodewords_url($path, $options));
   }
 }