diff --git a/metatag.metatag.inc b/metatag.metatag.inc
index e8258b4..21f3e4e 100644
--- a/metatag.metatag.inc
+++ b/metatag.metatag.inc
@@ -13,6 +13,8 @@ function metatag_metatag_config_default() {
   $config->config = array(
     'title' => array('value' => '[current-page:title] | [site:name]'),
     'generator' => array('value' => 'Drupal 7 (http://drupal.org)'),
+    'canonical' => array('value' => '[current-page:url:absolute]'),
+    'shortlink' => array('value' => '[current-page:url:unaliased]'),
   );
   $configs[$config->instance] = $config;
 
diff --git a/metatag.test b/metatag.test
index 7abc4a1..fa1838d 100644
--- a/metatag.test
+++ b/metatag.test
@@ -30,6 +30,8 @@ class MetaTagsUnitTest extends MetaTagsTestHelper {
       'title' => array('value' => 'Test altered title'),
       'test:foo' => array('value' => 'foobar'),
       'generator' => array('value' => 'Drupal 7 (http://drupal.org)'),
+      'canonical' => array('value' => '[current-page:url:absolute]'),
+      'shortlink' => array('value' => '[current-page:url:unaliased]'),
     ));
   }
 
diff --git a/metatag_opengraph/metatag_opengraph.metatag.inc b/metatag_opengraph/metatag_opengraph.metatag.inc
index fd50573..be75dff 100644
--- a/metatag_opengraph/metatag_opengraph.metatag.inc
+++ b/metatag_opengraph/metatag_opengraph.metatag.inc
@@ -16,7 +16,7 @@ function metatag_opengraph_metatag_config_default_alter(array &$configs) {
           'og:type' => array('value' => 'article'),
           'og:title' => array('value' => '[current-page:title]'),
           'og:site_name' => array('value' => '[site:name]'),
-          'og:url' => array('value' => '[current-page:url]'),
+          'og:url' => array('value' => '[current-page:url:absolute]'),
         );
         break;
       case 'global:frontpage':