diff --git a/uc_order/uc_order.tokens.inc b/uc_order/uc_order.tokens.inc
index c3f3c60..39bc390 100644
--- a/uc_order/uc_order.tokens.inc
+++ b/uc_order/uc_order.tokens.inc
@@ -122,6 +122,21 @@ function uc_order_token_info() {
     'name' => t('Products'),
     'description' => t('A list of products in the order.'),
   );
+  
+  $tokens['shipment-carrier'] = array(
+    'name' => t('Shipment Carrier'),
+    'description' => t('Shipment Carrier - for example UPS Ground or USPS.'),
+  );
+  
+  $tokens['tracking-package'] = array(
+    'name' => t('Tracking - Package'),
+    'description' => t('Tracking number for individual package.'),
+  );
+  
+  $tokens['tracking-shipment'] = array(
+    'name' => t('Tracking - Shipment'),
+    'description' => t('Tracking number for entire shipment.'),
+  );
 
   return array(
     'types' => array('uc_order' => $types),
@@ -307,6 +322,30 @@ function uc_order_tokens($type, $tokens, $data = array(), $options = array()) {
           }
           $replacements[$original] = implode("<br />\n", $products);
           break;
+        
+        case 'shipment-carrier':
+          $result = db_query_range("SELECT carrier FROM {uc_shipments} WHERE order_id = :order_id ORDER BY order_id DESC", 0, 1, array(':order_id' => $order->order_id))->fetchField();
+          if ($sanitize) {
+            $result = check_plain($result);
+          }
+          $replacements[$original] = empty($result) ? t('<i>No carrier information found.</i>') : $result;
+          break;
+        
+        case 'tracking-package':
+          $result = db_query_range("SELECT tracking_number FROM {uc_packages} WHERE order_id = :order_id ORDER BY package_id DESC", 0, 1, array(':order_id' => $order->order_id))->fetchField();
+          if ($sanitize) {
+            $result = check_plain($result);
+          }
+          $replacements[$original] = empty($result) ? t('<i>No package tracking number found.</i>') : $result;
+          break;
+        
+        case 'tracking-shipment':
+          $result = db_query_range("SELECT tracking_number FROM {uc_shipments} WHERE order_id = :order_id ORDER BY order_id DESC", 0, 1, array(':order_id' => $order->order_id))->fetchField();
+          if ($sanitize) {
+            $result = check_plain($result);
+          }
+          $replacements[$original] = empty($result) ? t('<i>No shipment tracking number found.</i>') : $result;
+          break;
       }
     }