diff -up feedapi_mapper-1/feedapi_mapper.info feedapi_mapper/feedapi_mapper.info
--- feedapi_mapper-1/feedapi_mapper.info	2008-03-17 17:06:20.000000000 -0700
+++ feedapi_mapper/feedapi_mapper.info	2008-04-28 07:30:18.000000000 -0700
@@ -1,9 +1,6 @@
 name = FeedAPI Mapper
 description = "Maps feed item elements to node fields."
-dependencies = feedapi feedapi_node
+dependencies[] = feedapi_node
+dependencies[] = feedapi
 package = FeedAPI Add On
-; Information added by drupal.org packaging script on 2008-03-18
-version = "5.x-1.x-dev"
-project = "feedapi_mapper"
-datestamp = "1205798780"
-
+core = 6.x
\ No newline at end of file
diff -up feedapi_mapper-1/feedapi_mapper.install feedapi_mapper/feedapi_mapper.install
--- feedapi_mapper-1/feedapi_mapper.install	2008-01-18 13:59:58.000000000 -0800
+++ feedapi_mapper/feedapi_mapper.install	2008-04-28 11:27:31.000000000 -0700
@@ -2,33 +2,36 @@
 // $Id: feedapi_mapper.install,v 1.1 2008/01/18 21:59:58 alexb Exp $
 
 /**
+ * Implementaton of hook_schema().
+ */
+function feedapi_mapper_schema() {
+  $schema['feedapi_mapper'] = array(
+    'desciption' => t('Store date for the feedapi mapper'),
+    'fields' => array(
+      'nid' => array(
+        'description' => t('The primary identifier for the feed.'),
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => TRUE),
+      'mapping' => array(
+        'type' => 'text',
+        'size' => 'big',
+        'not null' => TRUE),
+      ),
+    'primary key' => array('nid'),
+    );
+}
+/**
  * Implementaton of hook_install().
  */
 function feedapi_mapper_install() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysqli':
-    case 'mysql':
-      db_query("CREATE TABLE {feedapi_mapper} (
-        `nid` INT( 10 ) UNSIGNED NOT NULL ,
-        `mapping` LONGTEXT NOT NULL ,
-        PRIMARY KEY ( `nid` )
-        )"); 
-      break;
-    case 'pgsql':
-      // Todo.
-      break;
-  }
+  drupal_install_schema('feedapi_mapper');
 }
 
 /**
  * Implementaton of hook_uninstall().
  */
 function feedapi_mapper_uninstall() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysqli':
-    case 'mysql':
-    case 'pgsql':
-      db_query("DROP TABLE {feedapi_mapper}");
-      break;
-  }
+  drupal_uninstall_schema('feedapi_mapper');
+  
 }
\ No newline at end of file
diff -up feedapi_mapper-1/feedapi_mapper.module feedapi_mapper/feedapi_mapper.module
--- feedapi_mapper-1/feedapi_mapper.module	2008-03-17 09:24:16.000000000 -0700
+++ feedapi_mapper/feedapi_mapper.module	2008-04-28 11:43:16.000000000 -0700
@@ -4,8 +4,8 @@
 /**
  * Implementation of hook_help().
  */
-function feedapi_mapper_help($section) {
-  switch ($section) {
+function feedapi_mapper_help($path, $arg) {
+  switch ($path) {
     case 'admin/help#feedapi_mapper':
       return t('FeedAPI Mapper - maps feed item elements to node fields');
     case 'feedapi_mapper/full_name':
@@ -16,27 +16,28 @@ function feedapi_mapper_help($section) {
 /**
  * Implementation of hook_menu().
  */
-function feedapi_mapper_menu($may_cache) {
+function feedapi_mapper_menu() {
   $items = array();
+  if (arg(0) == 'node' && is_numeric(arg(1))) {
+    $node = menu_get_object();
+    if (feedapi_enabled($node->type)) {
+      global $user;
+      $items['node/%node_id/map'] = array(
+        'title' => 'Map',
+        'page callback' => 'feedapi_mapper_page',
+        'page arguments' => array($node),
+        'type' => MENU_LOCAL_TASK,
+        'access callback' => 'user_access',
+        'access arguments' => 'administer feedapi',
+        );
+    }
   if (!$may_cache) {
-    if (arg(0) == 'node' && is_numeric(arg(1))) {
-      $node = node_load(arg(1));
-      if (feedapi_enabled($node->type)) {
-        global $user;
-        $items[] = array('path' => 'node/'. $node->nid .'/map',
-          'title' => t('Map'),
-          'callback' => 'feedapi_mapper_page',
-          'callback arguments' => array($node),
-          'type' => MENU_LOCAL_TASK,
-          'access' => (user_access('administer feedapi')),
-          );
-      }
+    
     }
-    else if (arg(0) == 'admin' && arg(1) == 'content' && arg(2) == 'types') {
+    else if (arg(0) == 'admin' && arg(1) == 'content' && arg(2) == 'node-type') {
       $node_type = arg(3) ? str_replace('-', '_', arg(3)) : NULL;
       if ($node_type && feedapi_enabled($node_type)) {
-        $items[] = array(
-            'path' => 'admin/content/types/'. str_replace('_', '-', $node_type) .'/edit',
+        $items['admin/content/node-type/'. str_replace('_', '-', $node_type) .'/edit'] = array(
             'title' => t('Edit'),
             'callback' => 'drupal_get_form',
             'callback arguments' => array('node_type_form', $node_type),
@@ -45,7 +46,7 @@ function feedapi_mapper_menu($may_cache)
         // @todo: this should finally live in a sub tab of "Feed".
         $node = new stdClass();
         $node->type = $node_type;
-        $items[] = array('path' => 'admin/content/types/'. str_replace('_', '-', $node_type) .'/map',
+        $items['admin/content/node-type/'. str_replace('_', '-', $node_type) .'/map'] = array(
           'title' => t('Map'),
           'callback' => 'feedapi_mapper_page',
           'callback arguments' => array($node),
@@ -64,10 +65,10 @@ function feedapi_mapper_menu($may_cache)
 function feedapi_mapper_nodeapi(&$node, $op, $teaser, $page) {
   switch ($op) {
   case 'prepare':
-   if ($node->feedapi->feed_item) {
-     _feedapi_mapper_map($node);
-   }
-   break;
+    if ($node->feedapi->feed_item) {
+      _feedapi_mapper_map($node);
+    }
+    break;
   }
 }
 
@@ -177,11 +178,11 @@ function feedapi_mapper_form($node) {
       '#collapsible' => TRUE,
       '#collapsed' => FALSE,
       '#tree' => TRUE,
-      );  
+      );
     $form['descriptions']['descriptions'] = array(
       '#type' => 'markup',
       '#value' => $descriptions,
-      );  
+      );
   }
   // Create mapping form.
   $form['mapping'] = array(
@@ -210,8 +211,8 @@ function feedapi_mapper_form($node) {
 /**
  * Submit hook.
  */
-function feedapi_mapper_form_submit($form_id, $form_values) {
-  _feedapi_mapper_store_mapping($form_values['nid'], $form_values['mapping'], $form_values['elements']);
+function feedapi_mapper_form_submit($form, &$form_state) {
+  _feedapi_mapper_store_mapping($form_state['nid'], $form_state['mapping'], $form_state['elements']);
 }
 
 /**
@@ -225,8 +226,8 @@ function feedapi_mapper_form_submit($for
  */
 function _feedapi_mapper_store_mapping($param, $mapping, $elements) {
   // Wrap the mapping array (element_name => node_field)
-  // and the elements array (element_name => element_path) 
-  // arrays into one: 
+  // and the elements array (element_name => element_path)
+  // arrays into one:
   // We store a mapping as element_path => node_field.
   // - element_path and node_field are both a serialized array.
   $stored_mapping = array();
@@ -250,7 +251,7 @@ function _feedapi_mapper_store_mapping($
 
 /**
  * Retrieve mapping from db.
- * @param $param 
+ * @param $param
  * node id or node type
  * @return Associative array in the format
  * array(
@@ -282,9 +283,9 @@ function _feedapi_mapper_load_mappers() 
   static $loaded = FALSE;
   if (!$loaded) {
     // Load all feedapi mapper implementations from ./mappers
-    $path = drupal_get_path('module', 'feedapi_mapper') . '/mappers';
+    $path = drupal_get_path('module', 'feedapi_mapper') .'/mappers';
     $files = drupal_system_listing('.*\.inc$', $path, 'name', 0);
-    foreach($files as $file) {
+    foreach ($files as $file) {
       require_once("./$file->filename");
     }
     // Rebuild cache.
@@ -371,7 +372,7 @@ function _feedapi_mapper_get_feed_elemen
 /**
  * Traverse an associative array and look for path to first leaf.
  * If found, unset leaf and return path to it.
- * @return 
+ * @return
  * A path to a leaf element in the format
  * array(path, to, leaf, element);
  */
@@ -408,7 +409,7 @@ function _feedapi_mapper_next_element_pa
 }
 
 /**
- * Converts a multidemensional associative array with interdispersed objects into 
+ * Converts a multidemensional associative array with interdispersed objects into
  * an associative array only.
  */
 function _feedapi_mapper_obj2array($items) {
@@ -440,7 +441,7 @@ function _feedapi_mapper_truncate_array(
 }
 
 /**
- * Like array_merge_recursive. Only difference: does NOT merge 
+ * Like array_merge_recursive. Only difference: does NOT merge
  * two different keys into an array, but merges key on key.
  * Argument 1 always has to be an array.
  */
@@ -467,11 +468,11 @@ function _feedapi_mapper_array_merge_rec
 }
 
 /**
- * Get field mappers for a given node type. Returns an array of all 
+ * Get field mappers for a given node type. Returns an array of all
  * feed mappers that are applicable to this node type.
  * @param $node_type
  *   Valid node type.
- * @return 
+ * @return
  *   Array of fields that are mappable for this content type.
  */
 function _feedapi_mapper_get_field_mappers($node_type) {
@@ -502,10 +503,10 @@ function _feedapi_mapper_get_field_mappe
 
 /**
  * Returns descriptions for all mappable fields of given node type.
- * @return 
- *   Array in the format 
- *   array('field_name_a' => 
- *          array('module_name_a' => 'Descriptive text'), 
+ * @return
+ *   Array in the format
+ *   array('field_name_a' =>
+ *          array('module_name_a' => 'Descriptive text'),
  *                'module_name_b' => ...),
  *         'field_name_b' =>  array(...),
  *         );
@@ -544,11 +545,11 @@ function _feedapi_mapper_get_node_form($
 
 /**
  * Retrieve all field names on a given node type.
- * 
+ *
  * @todo:
  * This is still somewhat of a cooking recipe and e. g. does not expose teaser nor body filter,
  * as they are not present as such neither on the form nor in the node of the initial form.
- * 
+ *
  * If there are suggestions on how to improve this routine, I'd be happy to know them.
  *
  * @param string $node_type
@@ -573,7 +574,7 @@ function _feedapi_mapper_get_field_names
  * Theming function for outputting result of _feedapi_mapper_get_field_mappers_descriptions().
  * @param $descriptions
  *   Result of _feedapi_mapper_get_field_mappers_descriptions().
- * @return 
+ * @return
  *   HTML output.
  */
 function theme_feedapi_mapper_descriptions($descriptions) {
@@ -586,4 +587,18 @@ function theme_feedapi_mapper_descriptio
   }
   $output .= '</dl>';
   return $output;
+}
+
+/**
+ * Implementation of hook_theme
+ *
+ */
+function feedapi_mapper_theme() {
+  return array(
+    'feedapi_mapper_descriptions' => array(
+        'arguments' => array('descriptions'),
+        ),
+    
+    );
+  
 }
\ No newline at end of file
Common subdirectories: feedapi_mapper-1/mappers and feedapi_mapper/mappers