diff --git a/bug_update.php b/bug_update.php
index afcb996127..6b9e0061a3 100644
--- a/bug_update.php
+++ b/bug_update.php
@@ -40,12 +40,16 @@
 	if (!isset( $f_version )) {
 		$f_version = "";
 	}
+	if (!isset( $f_build )) {
+		$f_build = "";
+	}
 
 	# prepare strings
 	$f_os 						= string_prepare_text( $f_os );
 	$f_os_build 				= string_prepare_text( $f_os_build );
 	$f_platform					= string_prepare_text( $f_platform );
 	$f_version 					= string_prepare_text( $f_version );
+	$f_build 					= string_prepare_text( $f_build );
 	$f_summary					= string_prepare_text( $f_summary );
 	$f_description 				= string_prepare_textarea( $f_description );
 	$f_steps_to_reproduce 		= string_prepare_textarea( $f_steps_to_reproduce );
@@ -62,7 +66,10 @@
 				priority='$f_priority', status='$f_status',
 				projection='$f_projection', duplicate_id='$f_duplicate_id',
 				resolution='$f_resolution', handler_id='$f_handler_id',
-				eta='$f_eta', summary='$f_summary'
+				eta='$f_eta', summary='$f_summary',
+				os='$f_os', os_build='$f_os_build',
+				platform='$f_platform', build='$f_build',
+				version='$f_version'
     		WHERE id='$f_id'";
    	$result = db_query($query);
 
diff --git a/bug_update_advanced_page.php b/bug_update_advanced_page.php
index 0220eb9b9e..1c8562efef 100644
--- a/bug_update_advanced_page.php
+++ b/bug_update_advanced_page.php
@@ -163,7 +163,7 @@
 		<?php echo $s_platform ?>
 	</td>
 	<td>
-		<?php echo $v_platform ?>
+		<input type="text" name="f_platform" size="16" maxlength="32" value="<?php echo $v_platform ?>">
 	</td>
 </tr>
 <tr class="row-2">
@@ -185,7 +185,7 @@
 		<?php echo $s_os ?>
 	</td>
 	<td>
-		<?php echo $v_os ?>
+		<input type="text" name="f_os" size="16" maxlength="32" value="<?php echo $v_os ?>">
 	</td>
 </tr>
 <tr class="row-1">
@@ -204,7 +204,7 @@
 		<?php echo $s_os_version ?>
 	</td>
 	<td>
-		<?php echo $v_os_build ?>
+		<input type="text" name="f_os_build" size="16" maxlength="16" value="<?php echo $v_os_build ?>">
 	</td>
 </tr>
 <tr class="row-2">
@@ -223,7 +223,9 @@
 		<?php echo $s_product_version ?>
 	</td>
 	<td>
-		<?php echo $v_version ?>
+		<select name="f_version">
+			<?php print_version_option_list( $f_version, $v_version ) ?>
+		</select>
 	</td>
 </tr>
 <tr class="row-1">
@@ -234,7 +236,7 @@
 		<?php echo $s_build ?>
 	</td>
 	<td>
-		<?php echo $v_build?>
+		<input type="text" name="f_build" size="16" maxlength="32" value="<?php echo $v_build ?>">
 	</td>
 </tr>
 <tr class="row-2">
diff --git a/bug_update_page.php b/bug_update_page.php
index a165ed92c1..b4ec9de8cb 100644
--- a/bug_update_page.php
+++ b/bug_update_page.php
@@ -61,6 +61,7 @@
 <input type="hidden" name="f_os_build"           value="<?php echo $v_os_build ?>">
 <input type="hidden" name="f_platform"           value="<?php echo $v_platform ?>">
 <input type="hidden" name="f_version"            value="<?php echo $v_version ?>">
+<input type="hidden" name="f_build"              value="<?php echo $v_build ?>">
 <input type="hidden" name="f_steps_to_reproduce" value="<?php echo $v2_steps_to_reproduce ?>">
 <tr>
 	<td class="form-title" colspan="3">
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3cb757e58f..416dff36bc 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -16,6 +16,7 @@ Mantis
  * Modified reset password functionality to use g_send_reset_password to determine whether a password is set to blank or emailed to the user.
  * Modified color legend is now generated form the $g_status_enum_string variable.
  * Modified print_enum_string_option_list() to work better.
+ * Modified bug_update_advanced to allow for more fields to be updated.
  * Added Hungarian translation.
  * Added g_bug_link_tag to let users customize how to create bug links.
  * Added a "jump to bugnotes" quicklink at the top of the view bug pages.
diff --git a/report_add.php b/report_add.php
index b2d3bcbaa1..b2c6ef11b4 100644
--- a/report_add.php
+++ b/report_add.php
@@ -49,8 +49,8 @@
 		$f_os = "";
 	}
 
-	if ( !isset( $f_osbuild ) ) {
-		$f_osbuild = "";
+	if ( !isset( $f_os_build ) ) {
+		$f_os_build = "";
 	}
 
 	if ( !isset( $f_product_version ) ) {
@@ -86,7 +86,7 @@
 		$f_build 				= string_prepare_text( $f_build );
 		$f_platform 			= string_prepare_text( $f_platform );
 		$f_os 					= string_prepare_text( $f_os );
-		$f_osbuild 				= string_prepare_text( $f_osbuild );
+		$f_os_build 			= string_prepare_text( $f_os_build );
 
 		# if a profile was selected then let's use that information
 		if ( !empty( $f_profile_id ) ) {
@@ -101,7 +101,7 @@
 
 			$f_platform	= string_prepare_text( $v_platform );
 			$f_os		= string_prepare_text( $v_os );
-			$f_osbuild	= string_prepare_text( $v_os_build );
+			$f_os_build	= string_prepare_text( $v_os_build );
 		}
 
 		# Insert text information
@@ -137,7 +137,7 @@
 				VALUES
 				( null, '$g_project_cookie_val', '$u_id', '$f_assign_id', '0000000', '$t_nor', '$f_severity',
 				'$f_reproducibility', '$t_status', '$t_open', 10, '$f_category',
-				NOW(), NOW(), 10, '$t_id', '$f_os', '$f_osbuild',
+				NOW(), NOW(), 10, '$t_id', '$f_os', '$f_os_build',
 				'$f_platform', '$f_product_version', '$f_build',
 				1, '$f_profile_id', '$f_summary' )";
 		$result = db_query( $query );
@@ -230,7 +230,7 @@
 			<input type="hidden" name="f_profile_id" 		value="<?php echo $f_profile_id ?>">
 			<input type="hidden" name="f_platform" 			value="<?php echo $f_platform ?>">
 			<input type="hidden" name="f_os" 				value="<?php echo $f_os ?>">
-			<input type="hidden" name="f_osbuild" 			value="<?php echo $f_osbuild ?>">
+			<input type="hidden" name="f_os_build" 			value="<?php echo $f_os_build ?>">
 			<input type="hidden" name="f_product_version" 	value="<?php echo $f_product_version ?>">
 			<input type="hidden" name="f_build" 			value="<?php echo $f_build ?>">
 			<input type="hidden" name="f_assign_id" 		value="<?php echo $f_assign_id ?>">
@@ -255,7 +255,7 @@
 				<input type="hidden" name="f_profile_id" 		value="<?php echo $f_profile_id ?>">
 				<input type="hidden" name="f_platform" 			value="<?php echo $f_platform ?>">
 				<input type="hidden" name="f_os" 				value="<?php echo $f_os ?>">
-				<input type="hidden" name="f_osbuild" 			value="<?php echo $f_osbuild ?>">
+				<input type="hidden" name="f_os_build" 			value="<?php echo $f_os_build ?>">
 				<input type="hidden" name="f_product_version" 	value="<?php echo $f_product_version ?>">
 				<input type="hidden" name="f_build" 			value="<?php echo $f_build ?>">
 				<input type="hidden" name="f_report_stay" 		value="<?php echo $f_report_stay ?>">
diff --git a/report_bug_advanced_page.php b/report_bug_advanced_page.php
index 41eaa6d094..6e271da39b 100644
--- a/report_bug_advanced_page.php
+++ b/report_bug_advanced_page.php
@@ -48,8 +48,8 @@
 		$f_os = "";
 	}
 
-	if ( !isset( $f_osbuild ) ) {
-		$f_osbuild = "";
+	if ( !isset( $f_os_build ) ) {
+		$f_os_build = "";
 	}
 
 	if ( !isset( $f_product_version ) ) {
@@ -177,7 +177,7 @@
 		<?php echo $s_os_version ?>:
 	</td>
 	<td>
-		<input type="text" name="f_osbuild" size="16" maxlength="16" value="<?php echo $f_osbuild ?>">
+		<input type="text" name="f_os_build" size="16" maxlength="16" value="<?php echo $f_os_build ?>">
 	</td>
 </tr>
 <tr>