diff -ru adsense.orig/adsense.module adsense/adsense.module
--- adsense.orig/adsense.module	2008-03-27 23:13:43.000000000 +0100
+++ adsense/adsense.module	2008-03-28 01:17:40.000000000 +0100
@@ -1306,8 +1306,8 @@
   $patterns = array(
     'flexi' => '/\[adsense:flexiblock:(\d+)\]/x',
     'block' => '/\[adsense:block:(\d+)\]/x',
-    'tags'  => '/\[adsense:(\w+):(\d+):(\d+)\]/x',
-    'refer' => '/\[adsense:referrer:(\w+):(\d+):(\d+):(\w*):(\w*)\]/x'
+    'tags'  => '/\[adsense:([^:]+):(\d+):(\d+):?(\w*)\]/x',
+    'refer' => '/\[adsense:referral:(\w+):(\d+):(\d+):(\w*):(\w*)\]/x'
  );
 
   foreach ($patterns as $mode => $pattern) {
@@ -1321,7 +1321,7 @@
             $ad = _adsense_tag_block($match[1]);
             break;
           case 'tags':
-      $ad = adsense_display($match[1], $match[2], $match[3]);
+      $ad = adsense_display($match[1], $match[2], $match[3], $match[4]);
         break;
       case 'refer':
        $ad = adsense_display($match[1], $match[2], $match[3], $match[4], 1, $match[5]);
@@ -1470,7 +1470,7 @@
 }
 
 function adsense_filter_tips($delta, $format, $long = FALSE) {
-  return t('Use the special tag [adsense:<em>format</em>:<em>group</em>:<em>channel</em>] or [adsense:referral:<em>format</em>:<em>group</em>:<em>channel</em>:<em>slot</em>:<em>CPA</em>] or [adsense:flexiblock:<em>location</em>] to display Google AdSense ads.');
+  return t('Use the special tag [adsense:<em>format</em>:<em>group</em>:<em>channel</em>:<em>slot</em>] or [adsense:referral:<em>format</em>:<em>group</em>:<em>channel</em>:<em>slot</em>:<em>CPA</em>] or [adsense:block:<em>location</em>] to display Google AdSense ads.');
 }
 
 /**
diff -ru adsense.orig/adsense_help.inc adsense/adsense_help.inc
--- adsense.orig/adsense_help.inc	2008-03-28 00:51:55.000000000 +0100
+++ adsense/adsense_help.inc	2008-03-28 01:40:56.000000000 +0100
@@ -95,20 +95,20 @@
 <P>Note that filters sometimes may have conflicts, and changing the order can make AdSense work in some cases.</P>
 <P>The tag syntax comes in these variants:</P>
 <DL>
-	<DT>1. [adsense:<EM>format:group:channel</EM>]</DT>
+	<DT>1. [adsense:<EM>format:group:channel:slot</EM>]</DT>
 </DL>
 <P>Where:</P>
 <UL>
 	<LI>format: One of the supported ad formats (such as 468x60).
 	<LI>group: A number corresponding to the ad group this ad belongs to, determines colors.
 	<LI>channel: A number corresponding to the ad channel.
+        <LI>slot: Your ad's slot ID as provided by Google.
 </UL>
-<P>All fields are required, unlike when using the adsense_display()
+<P>All fields are required, except the slot field unlike when using the adsense_display()
 function above.</P>
 <P>Example:</P>
-<PRE>[adsense:468x60:1:2]</PRE><P>
-Display a 468x60 banner with the colors defined in group 1, and with
-channel ID 2</P>
+<PRE>[adsense:468x60:1:2:0123456789]</PRE><P>
+Display a 468x60 banner with the colors defined in group 1, channel ID 2 and with slot ID 0123456789.</P>
 <DL>
 	<DT>2. [adsense:block:<EM>block_id</EM>]</DT>
 </DL>
@@ -124,7 +124,22 @@
 <PRE>[adsense:block:7]</PRE>
 <P>Display the ad code of the block with ID 7.</P>
 <DL>
-	<DT>3. [adsense:flexiblock:<EM>location</EM>]</DT>
+	<DT>3. [adsense:referral:<EM>format:group:channel:slot:CPA</EM>]</DT>
+</DL>
+<P>Where:</P>
+<UL>
+	<LI>format: One of the supported ad formats (such as 468x60).
+	<LI>group: A number corresponding to the ad group this ad belongs to, determines colors.
+	<LI>channel: A number corresponding to the ad channel.
+        <LI>slot: Your ad's slot ID as provided by Google.
+        <LI>CPA: Your referral link CPA value.
+</UL>
+<P>Example:</P>
+<PRE>[adsense:referral:468x60:1:2:0123456789:CAAxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]</PRE><P>
+Display a 468x60 banner with the colors defined in group 1, channel ID 2, slot ID 0123456789
+and with CPA value CAAxxxxxxxxxxxxxxxxxxxxxxxxxxxxx.</P>
+<DL>
+	<DT>4. [adsense:flexiblock:<EM>location</EM>]</DT>
 </DL>
 <P>
 This is provided for backward compatibility, but will be deprecated