diff -u nodetype/nodetype.info nodetype-new/nodetype.info
--- nodetype/nodetype.info	2007-02-03 19:10:55.000000000 -0500
+++ nodetype-new/nodetype.info	2008-03-01 01:03:13.000000000 -0500
@@ -2,6 +2,7 @@
 name = Nodetype
 description = Allows you to change the content type of posts while editing them.
 ; Information added by drupal.org packaging script on 2007-02-04
-version = "5.x-1.x-dev"
+version = "6.x-1.x-dev"
+core = "6.x"
 project = "nodetype"
 
diff -u nodetype/nodetype.module nodetype-new/nodetype.module
--- nodetype/nodetype.module	2007-02-03 09:27:05.000000000 -0500
+++ nodetype-new/nodetype.module	2008-03-01 01:05:44.000000000 -0500
@@ -15,7 +15,7 @@
  */
 function nodetype_nodeapi(&$node, $op, $teaser = NULL, $page = NULL) { 
   switch ($op) { 
-    case 'submit':
+    case 'presave':
       if (isset($node->nodetype) && $node->nodetype) {
         $types = node_get_types();
         drupal_set_message(t('The type of the post %title has been changed from %old to %new.', array('%title' => $node->title, '%old' => $types[$node->type]->name, '%new' => $types[$node->nodetype]->name)));
@@ -28,7 +28,7 @@
 /**
  * Implementation of hook_form_alter().
  */
-function nodetype_form_alter($form_id, &$form) {
+function nodetype_form_alter(&$form, &$form_state, $form_id) {
   if (isset($form['type']) && $form['type']['#value'] .'_node_form' == $form_id && isset($form['#node']->nid) && user_access('change node types')) {
     $types = node_get_types();