diff --git a/sites/all/modules/weight/weight.install b/sites/all/modules/weight/weight.install
index a8d8035..607deae 100644
--- a/sites/all/modules/weight/weight.install
+++ b/sites/all/modules/weight/weight.install
@@ -47,6 +47,13 @@ function weight_schema() {
         'not null' => TRUE,
         'default' => 0,
       ),
+      'weight_frontpage' => array(
+        'type' => 'int',
+        'size' => 'tiny',
+        'unsigned' => TRUE,
+        'not null' => TRUE,
+        'default' => 1,
+      ),
     ),
     'primary key' => array('id'),
     'foreign keys' => array(
@@ -90,6 +97,7 @@ function weight_update_7200() {
   $range = variable_get('weight_range', 20);
   $menu_weight = variable_get('weight_use_menu', 0);
   $default = variable_get('weight_default', 0);
+  $frontpage = variable_get('weight_frontpage', 1);
 
   drupal_install_schema('weight');
 
@@ -113,6 +121,7 @@ function weight_update_7200() {
         'weight_range' => $range,
         'menu_weight' => $menu_weight,
         'weight_default' => $default,
+        'weight_frontpage' => $frontpage,
       ))
       ->execute();
   }
@@ -181,6 +190,7 @@ function weight_update_7203() {
   variable_del('weight_range');
   variable_del('weight_use_menu');
   variable_del('weight_default');
+  variable_del('weight_frontpage');
   variable_del('weight_label');
   variable_del('weight_position');
 }
diff --git a/sites/all/modules/weight/weight.module b/sites/all/modules/weight/weight.module
index 67cd0bd..f4e2c64 100644
--- a/sites/all/modules/weight/weight.module
+++ b/sites/all/modules/weight/weight.module
@@ -25,7 +25,7 @@ function weight_menu_alter(&$items) {
 
   // Check to see if  any content types are weight enabled.
   foreach ($settings as $setting) {
-    if ($setting['enabled']) {
+    if ($setting['enabled'] && $setting['frontpage']) {
       $enabled = TRUE;
       break;
     }
@@ -220,6 +220,14 @@ function weight_form_node_type_form_alter(&$form, &$form_state) {
     '#default_value' => isset($settings['default']) ? $settings['default'] : 0,
   );
 
+  $form['weight_settings']['weight_frontpage'] = array(
+    '#type' => 'radios',
+    '#title' => t('Add to Frontpage'),
+    '#description' => t('If your site uses a custom frontpage callback, you may need disable the Weight module\'s own callback method.'),
+    '#options' => array(t('No'), t('Yes')),
+    '#default_value' => isset($settings['frontpage']) ? $settings['frontpage'] : 1,
+  );
+
   $form['additional_settings']['#attached']['js'][] = drupal_get_path('module', 'weight') . '/weight.js';
   $form['#submit'][] = 'weight_node_type_form_submit';
 }
@@ -240,6 +248,7 @@ function weight_node_type_form_submit($form, &$form_state) {
         'weight_range' => $values['weight_range'],
         'menu_weight' => $values['weight_menu'],
         'weight_default' => $values['weight_default'],
+        'weight_frontpage' => $values['weight_frontpage'],
       ))
       ->condition('type', $values['type'])
       ->execute();
@@ -252,6 +261,7 @@ function weight_node_type_form_submit($form, &$form_state) {
         'weight_range' => $values['weight_range'],
         'menu_weight' => $values['weight_menu'],
         'weight_default' => $values['weight_default'],
+        'weight_frontpage' => $values['weight_frontpage'],
       ))
       ->execute();
   }
@@ -435,6 +445,7 @@ function _weight_get_settings($type = NULL) {
         'range' => $row->weight_range,
         'menu_weight' => $row->menu_weight,
         'default' => $row->weight_default,
+        'frontpage' => $row->weight_frontpage,
       );
     }
   }
@@ -446,6 +457,7 @@ function _weight_get_settings($type = NULL) {
         'range' => $row->weight_range,
         'menu_weight' => $row->menu_weight,
         'default' => $row->weight_default,
+        'frontpage' => $row->weight_frontpage,
       );
     }
   }