diff -uwr pam_auth.org/pam_auth.info pam_auth/pam_auth.info
--- pam_auth.org/pam_auth.info	2007-11-13 09:08:17.000000000 +0900
+++ pam_auth/pam_auth.info	2008-06-06 00:52:29.000000000 +0900
@@ -1,13 +1,14 @@
 name = "PAM Auth"
 description = "Users can log into Drupal sites using their PAM Unix username and password."
 package = Auth
+core = 6.x
 
-version = "5.x-1.x-dev"
+version = "6.x-1.x-dev"
 project = "pam_auth"
 
 
 ; Information added by drupal.org packaging script on 2007-11-13
-version = "5.x-1.x-dev"
+version = "6.x-1.x-dev"
 project = "pam_auth"
 datestamp = "1194912497"
 
diff -uwr pam_auth.org/pam_auth.module pam_auth/pam_auth.module
--- pam_auth.org/pam_auth.module	2007-11-13 03:39:22.000000000 +0900
+++ pam_auth/pam_auth.module	2008-06-06 00:11:54.000000000 +0900
@@ -9,9 +9,9 @@
 /**
  * Implementation of hook_help().
  */
-function pam_auth_help($section) {
+function pam_auth_help($path, $args) {
   
-  switch ($section) {
+  switch ($path) {
     case 'admin/help#pam_auth':
       return t("<p>The \"pam_auth\" module lets users log in using a PAM Unix account.</p>");
     case 'admin/settings/pam_auth':
@@ -29,16 +29,15 @@
 /**
  * Implementation of hook_menu().
  */
-function pam_auth_menu($may_cache) {
+function pam_auth_menu() {
 
   $items = array();
-  $items[] = array(
-    'path' => 'admin/settings/pam_auth',
+  $items['admin/settings/pam_auth'] = array(
     'title' => t('PAM auth'),
     'description' => t('Choose PAM services to authenticate users.'),
-    'callback' => 'drupal_get_form',
-    'callback arguments' => array('pam_auth_admin_settings'),
-    'access' => user_access('administer site configuration'),
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('pam_auth_admin_settings'),
+    'access arguments' => array('administer site configuration'),
    );
    return $items;
 }
@@ -46,14 +45,14 @@
 /**
  * Implementation of hook_form_alter().
  */
-function pam_auth_form_alter($form_id, &$form) {
+function pam_auth_form_alter(&$form, $form_state, $form_id) {
 
   switch ($form_id) {
     case 'user_login':
     case 'user_login_block':
       // Add pam_auth authentication if it's enabled.
       if (!empty($form_state['post']['name']) && variable_get('pam_auth_enabled', FALSE)) {
-        $form['#validate'][] = 'pam_auth_distributed_validate';
+        $form['#validate'][1] = 'pam_auth_distributed_validate';
       }
       if (variable_get('pam_auth_enabled', FALSE) && !variable_get('pam_auth_disable_password_changes', FALSE)) {
         unset($form['links']);