diff --git a/Source/Source.php b/Source/Source.php
index ff55a85..26d51fd 100644
--- a/Source/Source.php
+++ b/Source/Source.php
@@ -48,6 +48,10 @@
 			'buglink_regex_1'	=> '/(?:bugs?|issues?|reports?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
 			'buglink_regex_2'	=> '/#?(\d+)/',
 
+			'bugfix_resolving'	=> OFF,
+			'bugfix_regex_1'	=> '/(?:fixe?s?|resolves?)+\s+(?:bugs?|issues?|reports?)+\s+(?:#?(?:\d+)[,\.\s]*)+/i',
+			'bugfix_regex_2'	=> '/#?(\d+)/',
+
 			'remote_checkin'	=> OFF,
 			'checkin_urls'		=> serialize( array( 'localhost' ) ),
 
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 8ce8a01..2366f83 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -80,6 +80,9 @@
 $s_plugin_Source_manage_threshold = 'Manage Threshold';
 $s_plugin_Source_buglink_regex_1 = 'Bug Link PCRE Pass 1';
 $s_plugin_Source_buglink_regex_2 = 'Bug Link PCRE Pass 2';
+$s_plugin_Source_bugfix_resolving = 'Allow Resolving Issues';
+$s_plugin_Source_bugfix_regex_1 = 'Bug Resolve PCRE Pass 1';
+$s_plugin_Source_bugfix_regex_2 = 'Bug Resolve PCRE Pass 2';
 $s_plugin_Source_reset = 'Reset to default';
 $s_plugin_Source_menu_links = 'Main Menu Links';
 $s_plugin_Source_show_repo_link = 'Repositories';
diff --git a/Source/pages/manage_config.php b/Source/pages/manage_config.php
index 8082f58..fe6f0d0 100644
--- a/Source/pages/manage_config.php
+++ b/Source/pages/manage_config.php
@@ -29,6 +29,12 @@
 $f_buglink_regex_2 = gpc_get_string( 'buglink_regex_2' );
 $f_buglink_reset_2 = gpc_get_string( 'buglink_reset_2', OFF );
 
+$f_bugfix_resolve = gpc_get_bool( 'bugfix_resolve' );
+$f_bugfix_regex_1 = gpc_get_string( 'bugfix_regex_1' );
+$f_bugfix_reset_1 = gpc_get_string( 'bugfix_reset_1', OFF );
+$f_bugfix_regex_2 = gpc_get_string( 'bugfix_regex_2' );
+$f_bugfix_reset_2 = gpc_get_string( 'bugfix_reset_2', OFF );
+
 function check_urls( $t_urls_in ) {
 	$t_urls_in = explode( "\n", $t_urls_in );
 	$t_urls_out = array();
@@ -81,6 +87,20 @@
 	plugin_config_delete( 'buglink_regex_2' );
 }
 
+maybe_set_option( 'bugfix_resolve', $f_bugfix_resolve );
+
+if ( ! $f_bugfix_reset_1 ) {
+	maybe_set_option( 'bugfix_regex_1', $f_bugfix_regex_1 );
+} else {
+	plugin_config_delete( 'bugfix_regex_1' );
+}
+
+if ( ! $f_bugfix_reset_2 ) {
+	maybe_set_option( 'bugfix_regex_2', $f_bugfix_regex_2 );
+} else {
+	plugin_config_delete( 'bugfix_regex_2' );
+}
+
 maybe_set_option( 'remote_checkin', $f_remote_checkin );
 maybe_set_option( 'checkin_urls', serialize( $t_checkin_urls ) );
 maybe_set_option( 'remote_imports', $f_remote_imports );
diff --git a/Source/pages/manage_config_page.php b/Source/pages/manage_config_page.php
index 280de0f..a0095f8 100644
--- a/Source/pages/manage_config_page.php
+++ b/Source/pages/manage_config_page.php
@@ -30,7 +30,7 @@
 <br/>
 <form action="<?php echo plugin_page( 'manage_config' ) ?>" method="post">
 <?php echo form_security_field( 'plugin_Source_manage_config' ) ?>
-<table class="width75" align="center" cellspacing="1">
+<table class="width100" align="center" cellspacing="1">
 
 <tr>
 <td class="form-title" colspan="2"><?php echo plugin_lang_get( 'title' ), ': ', plugin_lang_get( 'configuration' ) ?></td>
@@ -90,6 +90,29 @@
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'bugfix_resolving' ) ?></td>
+<td><input name="bugfix_resolving" type="checkbox" <?php echo (ON == plugin_config_get( 'bugfix_resolving' ) ? 'checked="checked"' : '') ?>></td>
+</tr>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'bugfix_regex_1' ) ?></td>
+<td>
+	<input name="bugfix_regex_1" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'bugfix_regex_1' ) ) ?>"/>
+	<br/><label><input name="bugfix_reset_1" type="checkbox"/><span class="small"><?php echo plugin_lang_get( 'reset' ) ?></span></label>
+</td>
+</tr>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'bugfix_regex_2' ) ?></td>
+<td>
+	<input name="bugfix_regex_2" size="50" maxlength="500" value="<?php echo string_attribute( plugin_config_get( 'bugfix_regex_2' ) ) ?>"/>
+	<br/><label><input name="bugfix_reset_2" type="checkbox"/><span class="small"><?php echo plugin_lang_get( 'reset' ) ?></span></label>
+</td>
+</tr>
+
+<tr><td class="spacer"></td></tr>
+
+<tr <?php echo helper_alternate_class() ?>>
 <td class="category"><?php echo plugin_lang_get( 'allow_remote_checkin' ) ?></td>
 <td><input name="remote_checkin" type="checkbox" <?php echo (ON == $t_remote_checkin ? 'checked="checked"' : '') ?>></td>
 </tr>