diff -ur signature_forum/signature_forum.info signature_forum-new/signature_forum.info
--- signature_forum/signature_forum.info	2007-12-17 07:06:32.000000000 -0500
+++ signature_forum-new/signature_forum.info	2008-02-16 21:14:24.000000000 -0500
@@ -5,7 +5,8 @@
 package = User goodies
 
 ; Information added by drupal.org packaging script on 2007-12-17
-version = "5.x-1.x-dev"
+version = "6.x-1.x-dev"
+core = "6.x"
 project = "signature_forum"
 datestamp = "1197893192"
 
diff -ur signature_forum/signature_forum.module signature_forum-new/signature_forum.module
--- signature_forum/signature_forum.module	2007-12-17 00:30:27.000000000 -0500
+++ signature_forum-new/signature_forum.module	2008-02-16 21:21:09.000000000 -0500
@@ -15,8 +15,8 @@
 /**
  * Implementation of hook_help()
  */
-function signature_forum_help($section='') {
-  switch ($section) {
+function signature_forum_help($path='', $args = array()) {
+  switch ($path) {
     case 'admin/modules#description':
       return t('Manages user\'s signatures in the style most forum users will be familiar with. Allows much longer signatures than the Drupal default users can also use BBCode or HTML in their signatures.');
   };
@@ -33,7 +33,7 @@
  * Implementation of hook_menu()
  */
 function signature_forum_menu($may_cache) {
-	$items = array();
+  $items = array();
 
   if ($may_cache) {
     $items[] = array(
@@ -47,7 +47,7 @@
     );
   }
 
-	return $items;
+  return $items;
 }
 
 /**
@@ -83,15 +83,15 @@
     '#description' => t('Show signatures with nodes and comments for:'),
   );
   foreach (node_get_types('names') as $type => $name) {
-    $form['signature']['signature_forum_show_for_'.$type] = array(
+    $form['signature']['signature_forum_show_for_'. $type] = array(
       '#type' => 'checkbox',
       '#title' => $name,
       '#return_value' => 1,
-      '#default_value' => $default_values['signature_forum_show_for_'.$type],
+      '#default_value' => $default_values['signature_forum_show_for_'. $type],
     );
   }
 
-  $form['template'] = array (
+  $form['template'] = array(
     '#type' => 'textarea',
     '#title' => t('Template for signatures'),
     '#default_value' => $default_values['signature_forum_template'],
@@ -168,14 +168,14 @@
 /**
  * Admin settings form submit
  */
-function signature_forum_admin_settings_submit($form_id, $form_values) {
+function signature_forum_admin_settings_submit($form, $form_state) {
   $settings = array();
-  foreach($form_values as $form_value_key => $form_value_value) {
+  foreach ($form_state['values'] as $form_value_key => $form_value_value) {
     if (substr($form_value_key, 0, strlen('signature_forum_show_for_')) == 'signature_forum_show_for_') {
       $settings[$form_value_key] = $form_value_value;
     }
   }
-  if ($form_values['delete_signatures']) {
+  if ($form_state['values']['delete_signatures']) {
     db_query("UPDATE {comments} c INNER JOIN {users} u ON c.uid=u.uid
       SET c.comment=left(c.comment, length(c.comment) - length(u.signature))
       WHERE right(c.comment, length(u.signature)) LIKE u.signature;");
@@ -183,13 +183,13 @@
     cache_clear_all(NULL, 'cache_filter');
     drupal_set_message(t('Signatures in comments deleted.'));
   }
-  $settings['signature_forum_template'] = $form_values['template'];
-  $settings['signature_forum_format'] = $form_values['format'];
-  $settings['signature_forum_line_limit'] = $form_values['line_limit'];
-  $settings['signature_forum_min_content_length'] = $form_values['min_content_length'];
-  $settings['signature_forum_min_content_length_action'] = $form_values['min_content_length_action'];
-  $settings['signature_forum_min_content_length_filter'] = $form_values['min_content_length_filter'];
-  $settings['signature_forum_roles'] = $form_values['roles'];
+  $settings['signature_forum_template'] = $form_state['values']['template'];
+  $settings['signature_forum_format'] = $form_state['values']['format'];
+  $settings['signature_forum_line_limit'] = $form_state['values']['line_limit'];
+  $settings['signature_forum_min_content_length'] = $form_state['values']['min_content_length'];
+  $settings['signature_forum_min_content_length_action'] = $form_state['values']['min_content_length_action'];
+  $settings['signature_forum_min_content_length_filter'] = $form_state['values']['min_content_length_filter'];
+  $settings['signature_forum_roles'] = $form_state['values']['roles'];
   variable_set('signature_forum_settings', $settings);
   drupal_set_message(t('The configuration options have been saved.'));
 }
@@ -230,12 +230,12 @@
 /**
  * Implementation of hook_form_alter()
  */
-function signature_forum_form_alter($form_id, &$form) {
+function signature_forum_form_alter(&$form, &$form_state, $form_id) {
   $settings = variable_get('signature_forum_settings', signature_forum_defaults());
   // if signatures are disabled for all content types, hide signature field in user profile settings 
   if ($form_id == 'user_edit') {
     $enabled = false;
-    foreach(node_get_types('names') as $type => $name) {
+    foreach (node_get_types('names') as $type => $name) {
       if ($settings['signature_forum_show_for_'. $type]) {
         $enabled = true;
         break;
@@ -258,13 +258,13 @@
   $settings = variable_get('signature_forum_settings', signature_forum_defaults());
   if (!$teaser && $settings['signature_forum_show_for_'. $node->type]) {
     switch ($op) {
-	    case 'view':
+      case 'view':
         // Bug #190446 OG put $account->signature into comments (changing this just in case)
         $node->signature_forum = db_result(db_query('SELECT signature FROM {users_signature} WHERE uid = %d', $node->uid));
         signature_forum_logic($node->signature_forum, $node->uid, strlen(strip_tags($node->content['body']['#value'])));
-	      $node->content['body']['#value'] = $node->content['body']['#value'] . theme('signature_forum', $node->signature_forum);
-	      break;
-	  }
+        $node->content['body']['#value'] = $node->content['body']['#value'] . theme('signature_forum', $node->signature_forum);
+        break;
+      }
   }
 }