diff --git a/Source/Source.API.php b/Source/Source.API.php
index dc12e5a..d3812bd 100644
--- a/Source/Source.API.php
+++ b/Source/Source.API.php
@@ -457,6 +457,9 @@
 		$this->save_bugs();
 	}
 
+	/**
+	 * Update changeset relations to affected bugs.
+	 */
 	function save_bugs() {
 		$t_bug_table = plugin_table( 'bug', 'Source' );
 
@@ -466,10 +469,10 @@
 		$this->load_repo();
 
 		if ( count( $t_bugs_deleted ) ) {
-			$t_bugs_deleted = join( ',', $t_bugs_deleted );
+			$t_bugs_deleted_str = join( ',', $t_bugs_deleted );
 
 			$t_query = "DELETE FROM $t_bug_table WHERE change_id=" . $this->id .
-				" AND bug_id IN ( $t_bugs_deleted )";
+				" AND bug_id IN ( $t_bugs_deleted_str )";
 			db_query_bound( $t_query );
 
 			foreach( $t_bugs_deleted as $t_bug_id ) {
diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 799ef41..8ce8a01 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -53,6 +53,8 @@
 $s_plugin_Source_update = 'Update';
 $s_plugin_Source_delete = 'Delete';
 $s_plugin_Source_search = 'Search';
+$s_plugin_Source_attach = 'Attach';
+$s_plugin_Source_detach = 'Detach';
 $s_plugin_Source_modify_search = 'Modify Search';
 $s_plugin_Source_new_search = 'New Search';
 $s_plugin_Source_permalink = 'Permalink';
@@ -66,6 +68,7 @@
 $s_plugin_Source_import_latest = 'Import Latest Data';
 $s_plugin_Source_related_changesets = 'Related Changesets';
 $s_plugin_Source_affected_issues = 'Affected Issues';
+$s_plugin_Source_attach_to_issue = 'Attach Issues:';
 
 $s_plugin_Source_configuration = 'Configuration';
 $s_plugin_Source_allow_remote_checkin = 'Allow Remote Check-In';
diff --git a/Source/pages/attach.php b/Source/pages/attach.php
new file mode 100644
index 0000000..215910b
--- /dev/null
+++ b/Source/pages/attach.php
@@ -0,0 +1,40 @@
+<?php
+# Copyright (C) 2008	John Reese
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+form_security_validate( 'plugin_Source_attach' );
+access_ensure_global_level( plugin_config_get( 'update_threshold' ) );
+
+$f_changeset_id = gpc_get_int( 'id' );
+$f_bug_ids = gpc_get_string( 'bug_ids' );
+
+$t_changeset = SourceChangeset::load( $f_changeset_id );
+$t_changeset->load_bugs();
+
+$t_bug_ids = split( ',', $f_bug_ids );
+foreach( $t_bug_ids as $t_bug_id ) {
+	$t_bug_id = (int) $t_bug_id;
+
+	if ( $t_bug_id < 1 || !bug_exists( $t_bug_id ) ) {
+		continue;
+	}
+
+	if ( !in_array( $t_bug_id, $t_changeset->bugs ) ) {
+		$t_changeset->bugs[] = $t_bug_id;
+	}
+}
+
+$t_changeset->save_bugs();
+
+form_security_purge( 'plugin_Source_attach' );
+print_successful_redirect( plugin_page( 'view', true ) . '&id=' . $t_changeset->id );
+
diff --git a/Source/pages/detach.php b/Source/pages/detach.php
new file mode 100644
index 0000000..e559fab
--- /dev/null
+++ b/Source/pages/detach.php
@@ -0,0 +1,29 @@
+<?php
+# Copyright (C) 2008	John Reese
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+form_security_validate( 'plugin_Source_detach' );
+access_ensure_global_level( plugin_config_get( 'update_threshold' ) );
+
+$f_changeset_id = gpc_get_int( 'id' );
+$f_bug_id = gpc_get_int( 'bug_id' );
+
+$t_changeset = SourceChangeset::load( $f_changeset_id );
+$t_changeset->load_bugs();
+
+$t_changeset->bugs = array_diff( $t_changeset->bugs, array( $f_bug_id ) );
+
+$t_changeset->save_bugs();
+
+form_security_purge( 'plugin_Source_detach' );
+print_successful_redirect( plugin_page( 'view', true ) . '&id=' . $t_changeset->id );
+
diff --git a/Source/pages/view.php b/Source/pages/view.php
index e35a6b0..4a0a330 100644
--- a/Source/pages/view.php
+++ b/Source/pages/view.php
@@ -123,7 +123,7 @@
 <tr><td class="spacer"></td></tr>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td class="category" rowspan="<?php echo count( $t_changeset->bugs ) ?>">
+<td class="category" rowspan="<?php echo ( count( $t_changeset->bugs ) + ( $t_can_update ? 1 : 0 ) ) ?>">
 	<?php echo plugin_lang_get( 'affected_issues' ) ?>
 </td>
 
@@ -133,10 +133,23 @@
 	$t_bug = bug_get( $t_bug_id );
 	echo ( $t_first ? '' : '<tr ' . helper_alternate_class() . '>' );
 ?>
-<td colspan="<?php echo $t_columns-1 ?>"><?php echo '<a href="view.php?id=', $t_bug_id, '">', bug_format_id( $t_bug_id ), '</a>: ', string_display_line( $t_bug->summary ) ?></td>
+<td colspan="<?php echo $t_columns-( $t_can_update ? 2 : 1 ) ?>"><?php echo '<a href="view.php?id=', $t_bug_id, '">', bug_format_id( $t_bug_id ), '</a>: ', string_display_line( $t_bug->summary ) ?></td>
+<?php if ( $t_can_update ) { ?>
+<td class="center"><?php print_bracket_link( plugin_page( 'detach' ) . '&id=' . $t_changeset->id . '&bug_id=' . $t_bug_id . form_security_param( 'plugin_Source_detach' ), plugin_lang_get( 'detach' ) ) ?>
+<?php } ?>
 </tr>
 
-<?php $t_first = false; } } ?>
+<?php $t_first = false; } }
+	if ( $t_can_update ) { ?>
+	<tr <?php echo helper_alternate_class() ?>><td colspan="<?php echo $t_columns-1 ?>">
+<form action="<?php echo plugin_page( 'attach' )  ?>" method="post">
+<?php echo form_security_field( 'plugin_Source_attach' ) ?>
+<input type="hidden" name="id" value="<?php echo $t_changeset->id ?>"/>
+<?php echo plugin_lang_get( 'attach_to_issue' ) ?> <input name="bug_ids" size="15"/>
+<input type="submit" value="<?php echo plugin_lang_get( 'attach' ) ?>"/>
+</form>
+</td></tr>
+<?php } ?>
 
 <tr><td class="spacer"></td></tr>