diff -urNp og_forum/og_forum.info drupal-5.0/modules/og_forum/og_forum.info
--- og_forum/og_forum.info	1970-01-01 01:00:00.000000000 +0100
+++ drupal-5.0/modules/og_forum/og_forum.info	2007-01-29 15:43:59.000000000 +0000
@@ -0,0 +1,5 @@
+; $Id: og_forum.info$
+name = Organic groups forum
+description = Allows forums to be created within groups.
+dependencies = og forum
+package = Organic groups
diff -urNp og_forum/og_forum.module drupal-5.0/modules/og_forum/og_forum.module
--- og_forum/og_forum.module	2006-06-07 00:10:43.000000000 +0100
+++ drupal-5.0/modules/og_forum/og_forum.module	2007-01-29 16:13:29.000000000 +0000
@@ -29,18 +29,27 @@ function og_forum_help($section) {
 function og_forum_menu($may_cache) {
   $items = array();
 
-  if ($may_cache) {
+//  if ($may_cache) {
     $items[] = array(
       'path' => 'og_forum',
       'callback' => 'og_forum_page',
       'type' => MENU_CALLBACK,
       'access' => user_access('access content'),
-    );
-  }
+    ); 
 
+     $items[] = array(
+       'path' => 'admin/og/og_forum',
+       'title' => t('Organic Groups Forums'),
+       'description' => t('Configure Organic Groups Forums'),
+       'callback' => 'drupal_get_form',
+       'callback arguments' => array('og_forum_admin_settings'),
+       'access' => user_access('administer site configuration'),
+     );
   return $items;
+//  }
 }
 
+
 /**
  * Menu callback; allows us to set group context prior to
  * loading a forum
@@ -55,7 +64,19 @@ function og_forum_page($forum) {
 /**
  * Implementation of hook_settings().
  */
-function og_forum_settings() {
+
+/* function og_forum_menu($may_cache) {
+  $items[] = array(
+    'path' => 'admin/settings/og_forum',
+	'title' => t('Organic Groups Forums'),
+	'description' => t('Configure Organic Groups Forums'),
+	'callback' => 'drupal_get_form',
+	'callback arguments' => array('og_forum_admin_settings'),
+	'access' => user_access('administer site configuration'),
+  );
+} */
+
+function og_forum_admin_settings() {
   $form['#submit']['og_forum_settings_submit'] = array(); // custom submit handler
   $form['#submit']['system_settings_form_submit'] = array(); // form.inc never calls the $callback if a submit handler is defined
 
@@ -69,7 +90,7 @@ function og_forum_settings() {
     '#type' => 'submit',
     '#value' => t('Update old groups'),
   );
-  return $form;
+  return system_settings_form($form);
 }
 
 /**