diff --git nodeapi_example/nodeapi_example.install nodeapi_example/nodeapi_example.install
index 83539ab..41fa79b 100644
--- nodeapi_example/nodeapi_example.install
+++ nodeapi_example/nodeapi_example.install
@@ -25,13 +25,36 @@ function nodeapi_example_uninstall() {
  */
 function nodeapi_example_schema() {
   $schema['nodeapi_example'] = array(
-    'fields' => array(
-      'nid'    => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
-      'rating' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+  'fields' => array(
+      'id' => array(
+      'type' => 'serial',
+      'not null' => TRUE,
+      'description' => t('Primary Key: Unique ID.'),
     ),
-    'primary key' => array('nid'),
+    'nid' => array(
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+      'description' => t('node id for the rating'),
+    ),
+    'vid' => array(
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+      'description' => t('version id for rating'),
+    ),
+    'rating' => array(
+      'type' => 'int',
+      'unsigned' => TRUE,
+      'not null' => TRUE,
+      'default' => 0,
+      'description' => t('rating for this node'),
+    ),
+  ),
+  'primary key' => array('id'),
   );
-
   return $schema;
 }
 
diff --git nodeapi_example/nodeapi_example.module nodeapi_example/nodeapi_example.module
index ff98342..0b477f6 100755
--- nodeapi_example/nodeapi_example.module
+++ nodeapi_example/nodeapi_example.module
@@ -78,7 +78,8 @@ function nodeapi_example_nodeapi(&$node, $op, $teaser, $page) {
     // Now we need to take care of loading one of the extended nodes from the
     // database. An array containing our extra field needs to be returned.
     case 'load':
-      $rating = db_result(db_query('SELECT rating FROM {nodeapi_example} WHERE nid = %d', $node->nid));
+      // we match against vid in order to keep up with the current revision
+      $rating = db_result(db_query('SELECT rating FROM {nodeapi_example} WHERE vid = %d', $node->vid));
       return array('nodeapi_example_rating' => $rating);
       break;
 
@@ -86,7 +87,7 @@ function nodeapi_example_nodeapi(&$node, $op, $teaser, $page) {
     // database. It gives us a chance to create our own record in the database.
     case 'insert':
       if (variable_get('nodeapi_example_'. $node->type, 0)) {
-        db_query('INSERT INTO {nodeapi_example} (nid, rating) VALUES (%d, %d)', $node->nid, $node->nodeapi_example_rating);
+        db_query('INSERT INTO {nodeapi_example} (nid, vid, rating) VALUES (%d, %d, %d)', $node->nid, $node->vid, $node->nodeapi_example_rating);
       }
       break;
 
@@ -96,17 +97,26 @@ function nodeapi_example_nodeapi(&$node, $op, $teaser, $page) {
     // saved so there would be nothing to update.
     case 'update':
       if (variable_get('nodeapi_example_'. $node->type, 0)) {
-        db_query('DELETE FROM {nodeapi_example} WHERE nid = %d', $node->nid);
-        db_query('INSERT INTO {nodeapi_example} (nid, rating) VALUES (%d, %d)', $node->nid, $node->nodeapi_example_rating);
+        db_query('DELETE FROM {nodeapi_example} WHERE vid = %d', $node->vid);
+        db_query('INSERT INTO {nodeapi_example} (nid, vid, rating) VALUES (%d, %d, %d)', $node->nid, $node->vid, $node->nodeapi_example_rating);
       }
       break;
 
-    // Delete is called whn the node is being deleted, it gives us a chance
+    // Delete is called when the node is being deleted, it gives us a chance
     // to delete the rating too.
+    // This will delete all revisions as well.
     case 'delete':
       db_query('DELETE FROM {nodeapi_example} WHERE nid = %d', $node->nid);
       break;
 
+    // When a node revision is deleted, we need to remove the corresponding
+    // record from our table. The only way to handle revision deletion is by
+    // implementing hook_nodeapi().
+    case 'delete revision':
+      // Notice that we're matching a single revision based on the node's vid.
+      db_query('DELETE FROM {nodeapi_example} WHERE vid = %d', $node->vid);
+      break;
+
     // Finally, we need to take care of displaying our rating when the node is
     // viewed. This operation is called after the node has already been prepared
     // into HTML and filtered as necessary, so we know we are dealing with an