diff --git a/Source/lang/strings_english.txt b/Source/lang/strings_english.txt
index 821d5e1..3341906 100644
--- a/Source/lang/strings_english.txt
+++ b/Source/lang/strings_english.txt
@@ -44,6 +44,7 @@
 $s_plugin_Source_manage = 'Manage';
 $s_plugin_Source_create = 'Create';
 $s_plugin_Source_import = 'Import';
+$s_plugin_Source_edit = 'Edit';
 $s_plugin_Source_update = 'Update';
 $s_plugin_Source_delete = 'Delete';
 $s_plugin_Source_search = 'Search';
@@ -66,6 +67,7 @@
 
 $s_plugin_Source_back = 'Back to Index';
 $s_plugin_Source_back_repo = 'Back to Repository';
+$s_plugin_Source_back_changeset = 'Back to Changeset';
 $s_plugin_Source_import_full = 'Import Everything';
 $s_plugin_Source_import_latest = 'Import Latest Data';
 $s_plugin_Source_related_changesets = 'Related Changesets';
diff --git a/Source/pages/edit.php b/Source/pages/edit.php
new file mode 100644
index 0000000..423e40e
--- /dev/null
+++ b/Source/pages/edit.php
@@ -0,0 +1,55 @@
+<?php
+
+# Copyright (c) 2010 John Reese
+# Licensed under the MIT license
+
+form_security_validate( 'plugin_Source_edit' );
+access_ensure_global_level( plugin_config_get( 'update_threshold' ) );
+
+$f_changeset_id = gpc_get_int( 'id' );
+$f_offset = gpc_get_int( 'offset', 0 );
+
+$f_user_id = gpc_get_int( 'user_id' );
+$f_committer_id = gpc_get_int( 'committer_id' );
+$f_branch = gpc_get_string( 'branch' );
+$f_message = gpc_get_string( 'message' );
+
+$t_changeset = SourceChangeset::load( $f_changeset_id );
+
+$t_repos = SourceRepo::load_by_changesets( $t_changeset );
+if ( count( $t_repos ) < 1 ) {
+	trigger_error( ERROR_GENERIC, ERROR );
+}
+
+$t_repo = array_shift( $t_repos );
+$t_repo->load_branches();
+
+if ( $f_user_id == 0 || user_ensure_exists( $f_user_id ) ) {
+	$t_changeset->user_id = $f_user_id;
+}
+
+if ( $f_committer_id == 0 || user_ensure_exists( $f_committer_id ) ) {
+	$t_changeset->committer_id = $f_committer_id;
+}
+
+if ( in_array( $f_branch, $t_repo->branches ) ) {
+	$t_changeset->branch = $f_branch;
+}
+
+if ( plugin_config_get( 'enable_porting' ) ) {
+	$f_ported = gpc_get_string( 'ported', '' );
+
+	if ( 0 == $f_ported || in_array( $f_ported, $t_repo->branches ) ) {
+		$t_changeset->ported = $f_ported;
+	}
+}
+
+if ( !is_blank( $f_message ) ) {
+	$t_changeset->message = $f_message;
+}
+
+$t_changeset->save();
+
+form_security_purge( 'plugin_Source_edit' );
+print_successful_redirect( plugin_page( 'view', true ) . '&id=' . $t_changeset->id . '&offset=' . $f_offset );
+
diff --git a/Source/pages/edit_page.php b/Source/pages/edit_page.php
new file mode 100644
index 0000000..8355778
--- /dev/null
+++ b/Source/pages/edit_page.php
@@ -0,0 +1,106 @@
+<?php
+
+# Copyright (c) 2010 John Reese
+# Licensed under the MIT license
+
+access_ensure_global_level( plugin_config_get( 'update_threshold' ) );
+require_once( config_get( 'plugin_path' ) . 'Source/Source.ViewAPI.php' );
+
+$f_changeset_id = gpc_get_int( 'id' );
+$f_offset = gpc_get_int( 'offset', 0 );
+
+$t_changeset = SourceChangeset::load( $f_changeset_id );
+
+$t_repos = SourceRepo::load_by_changesets( $t_changeset );
+if ( count( $t_repos ) < 1 ) {
+	trigger_error( ERROR_GENERIC, ERROR );
+}
+
+$t_repo = array_shift( $t_repos );
+$t_repo->load_branches();
+$t_vcs = SourceVCS::repo( $t_repo );
+
+$t_use_porting = plugin_config_get( 'enable_porting' );
+
+html_page_top1( plugin_lang_get( 'title' ) );
+html_page_top2();
+?>
+
+<form action="<?php echo plugin_page( 'edit' ), '&id=', $t_changeset->id ?>" method="post">
+<?php echo form_security_field( 'plugin_Source_edit' ) ?>
+<input type="hidden" name="offset" value="<?php echo $f_offset ?>"/>
+
+<br/>
+<table class="<?php echo $t_columns > 4 ? 'width90' : 'width75' ?>" cellspacing="1" align="center">
+
+<tr>
+<td class="form-title" colspan="2"><?php echo string_display_line( $t_repo->name ), ': ', $t_vcs->show_changeset( $t_repo, $t_changeset ) ?></td>
+<td class="right">
+<?php print_bracket_link( plugin_page( 'view' ) . '&id=' . $t_changeset->id . '&offset=' . $f_offset, plugin_lang_get( 'back_changeset' ) ); ?>
+</td>
+<tr>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'author' ) ?></td>
+<td colspan="2"><select name="user_id">
+<option value="0" <?php echo check_selected( 0, $t_changeset->user_id ) ?>>--</option>
+<?php print_user_option_list( $t_changeset->user_id ) ?>
+</select></td>
+</tr>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'committer' ) ?></td>
+<td colspan="2"><select name="committer_id">
+<option value="0" <?php echo check_selected( 0, $t_changeset->committer_id ) ?>>--</option>
+<?php print_user_option_list( $t_changeset->committer_id ) ?>
+</select></td>
+</tr>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'branch' ) ?></td>
+<td colspan="2"><select name="branch">
+<?php if ( $t_changeset->branch == "" ) { ?>
+<option value="" <?php echo check_selected( "", $t_changeset->branch ) ?>>--</option>
+<?php } foreach( $t_repo->branches as $t_branch ) { ?>
+<option value="<?php echo string_attribute( $t_branch ) ?>" <?php echo check_selected( $t_branch, $t_changeset->branch ) ?>><?php echo string_display_line( $t_branch ) ?></option>
+<?php } ?>
+</select></td>
+</tr>
+
+<tr class="spacer">
+<td width="25%"></td>
+<td width="25%"></td>
+<td width="50%"></td>
+</tr>
+
+<?php if ( $t_use_porting ) { ?>
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'ported' ) ?></td>
+<td colspan="2"><select name="ported">
+<option value="" <?php echo check_selected( "", $t_changeset->ported ) ?>><?php echo plugin_lang_get( 'pending' ) ?></option>
+<option value="0" <?php echo check_selected( "0", $t_changeset->ported ) ?>><?php echo plugin_lang_get( 'na' ) ?></option>
+<option value="">--</option>
+<?php foreach( $t_repo->branches as $t_branch ) { if ( $t_branch == $t_changeset->branch ) { continue; } ?>
+<option value="<?php echo string_attribute( $t_branch ) ?>" <?php echo check_selected( $t_branch, $t_changeset->ported ) ?>><?php echo string_display_line( $t_branch ) ?></option>
+<?php } ?>
+</select></td>
+</tr>
+
+<tr class="spacer"><td></td><td></td><td></td></tr>
+<?php } ?>
+
+<tr <?php echo helper_alternate_class() ?>>
+<td class="category"><?php echo plugin_lang_get( 'message' ) ?></td>
+<td colspan="2"><textarea name="message" cols="80" rows="8"><?php echo string_textarea( $t_changeset->message ) ?></textarea></td>
+</tr>
+
+<tr>
+<td class="center" colspan="3"><input type="submit" value="<?php echo plugin_lang_get( 'edit' ) ?>"/></td>
+</tr>
+
+</table>
+</form>
+
+<?php
+html_page_bottom1( __FILE__ );
+
diff --git a/Source/pages/view.php b/Source/pages/view.php
index d0c31b9..a47ffee 100644
--- a/Source/pages/view.php
+++ b/Source/pages/view.php
@@ -48,7 +48,7 @@
 	( $t_use_porting ? 1 : 0 ) +
 	5;
 
-$t_update_form = $t_use_porting || false;
+$t_update_form = $t_use_porting && $t_can_update;
 
 html_page_top1( plugin_lang_get( 'title' ) );
 html_page_top2();
@@ -69,7 +69,7 @@
 	if ( $t_url = $t_vcs->url_changeset( $t_repo, $t_changeset ) ) {
 		print_bracket_link( $t_url, plugin_lang_get( 'diff', 'Source' ) );
 	}
-	print_bracket_link( plugin_page( 'list' ) . '&id=' . $t_repo->id . '&offset=' . $f_offset, "Back to Repository" );
+	print_bracket_link( plugin_page( 'list' ) . '&id=' . $t_repo->id . '&offset=' . $f_offset, plugin_lang_get( 'back_repo' ) );
 ?>
 </td>
 <tr>
@@ -91,29 +91,20 @@
 <td class="center"><?php echo string_display_line( $t_changeset->branch ) ?></td>
 <td class="center"><?php echo string_display_line( $t_changeset->timestamp ) ?></td>
 <td class="center"><?php if ( $t_changeset_parent ) { print_link( plugin_page( 'view' ) . '&id=' . $t_changeset_parent->id, $t_vcs->show_changeset( $t_repo, $t_changeset_parent ) ); } ?></td>
-<?php if ( $t_use_porting ) { ?>
 <td class="center">
+<?php if ( $t_update_form ) { ?>
 <select name="ported">
-<?php
-	echo '<option value=""',
-		( $t_changeset->ported == '' ? ' selected="selected"' : '' ),
-		'>', plugin_lang_get( 'pending' ), '</option>',
-		'<option value="0"',
-		( $t_changeset->ported == '0' ? ' selected="selected"' : '' ),
-		'>', plugin_lang_get( 'na' ), '</option>',
-		'<option value="">--</option>';
-
-	foreach( $t_repo->branches as $t_branch ) {
-		if ( $t_branch == $t_changeset->branch ) { continue; }
-
-		echo '<option value="', $t_branch, '"',
-			( $t_changeset->ported == $t_branch ? ' selected="selected"' : '' ),
-			'>', $t_branch, '</option>';
-	}
-?>
-</select>
-</td>
+<option value="" <?php echo check_selected( "", $t_changeset->ported ) ?>><?php echo plugin_lang_get( 'pending' ) ?></option>
+<option value="0" <?php echo check_selected( "0", $t_changeset->ported ) ?>><?php echo plugin_lang_get( 'na' ) ?></option>
+<option value="">--</option>
+<?php foreach( $t_repo->branches as $t_branch ) { if ( $t_branch == $t_changeset->branch ) { continue; } ?>
+<option value="<?php echo string_attribute( $t_branch ) ?>" <?php echo check_selected( $t_branch, $t_changeset->ported ) ?>><?php echo string_display_line( $t_branch ) ?></option>
 <?php } ?>
+</select>
+<?php } else {
+	echo $t_changeset->ported == "0" ? plugin_lang_get( 'na' ) : $t_changeset->ported == "" ? plugin_lang_get( 'pending' ) : string_display_line( $t_changeset->ported );
+} ?>
+</td>
 </tr>
 
 <?php if ( $t_update_form ) { ?>
@@ -181,6 +172,18 @@
 
 <?php } ?>
 
+<?php if ( $t_can_update ) { ?>
+<tr>
+<td class="center" colspan="<?php echo $t_columns ?>">
+<form action="<?php echo helper_mantis_url( 'plugin.php' ) ?>" method="get">
+<input type="hidden" name="page" value="Source/edit_page"/>
+<input type="hidden" name="id" value="<?php echo $t_changeset->id ?>"/>
+<input type="submit" value="<?php echo plugin_lang_get( 'edit' ) ?>"/>
+</form>
+</td>
+</tr>
+<?php } ?>
+
 </table>
 
 <?php