diff -daur ../orig/og_default_roles.info ./og_default_roles.info
--- ../orig/og_default_roles.info	2008-05-14 19:15:18.000000000 +0200
+++ ./og_default_roles.info	2008-11-01 04:32:04.331500000 +0100
@@ -1,10 +1,8 @@
 ; $Id: og_default_roles.info,v 1.1.2.1 2008/02/11 22:21:44 joshbenner Exp $
-name=OG Default Roles
-description=Allows each group to automatically grant certain roles to members upon joining.
-dependencies=og
-package=Organic groups
-; Information added by drupal.org packaging script on 2008-05-14
-version = "5.x-1.3"
-project = "og_default_roles"
-datestamp = "1210781718"
+name= "OG Default Roles"
+description= "Allows each group to automatically grant certain roles to members upon joining."
+package= "Organic groups"
+dependencies[] = og
+core = "6.x"
+version = "6.x-0.9patched"
 
diff -daur ../orig/og_default_roles.module ./og_default_roles.module
--- ../orig/og_default_roles.module	2008-11-01 04:30:26.276500000 +0100
+++ ./og_default_roles.module	2008-11-01 04:30:20.721500000 +0100
@@ -12,18 +12,16 @@
   return array('administer og default roles');
 }
 
-function og_default_roles_menu($may_cache) {
+function og_default_roles_menu() {
   $items = array();
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/og/default-roles',
+  $items['admin/og/default-roles'] = array(
       'title' => t('OG Default Roles'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('og_default_roles_settings'),
+      'description' => t('Set and remove roles to users when they join or leave a og.'),
+      'page callback' => 'drupal_get_form',
+      'page arguments' => array('og_default_roles_settings'),
+      'access arguments' => array('administer site configuration'),
       'type' => MENU_NORMAL_ITEM,
-      'access' => user_access('administer og default roles'),
     );
-  }
   return $items;
 }
 
@@ -78,7 +76,8 @@
 /**
  * Processes settings form
  */
-function og_default_roles_settings_submit($form_id, $values) {
+function og_default_roles_settings_submit($form, &$form_state) {
+  $values = $form_state['values'];
   foreach ($values as $fieldName=>$value) {
     if (preg_match('/(\d+)_grants_(\d+)/', $fieldName, $matches) && $value) {
       list(, $gid, $rid) = $matches;