diff --git a/ChangeLog b/ChangeLog
index 942f159b1f..580e1f43a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,7 +7,7 @@ Mantis
  * Modified file upload size to 60 to help out Netscape
  * Modified view_all_bug_page refresh to include offset
  * Fixed the post-report forms to redirect properly even if a proxy clears the HTTP_REFERER
-
+ * Added g_use_iis global to workaround an IIS bug with header/Location calls
 
 10.28.2001  -   0.15.10
 
diff --git a/config_inc.php b/config_inc.php
index 3aadaee709..12f3015f13 100644
--- a/config_inc.php
+++ b/config_inc.php
@@ -47,6 +47,14 @@
 	# requires trailing /
 	$g_absolute_path = "/usr/local/www/data/mantis/";
 
+	#############################
+	### Web Server            ###
+	#############################
+
+	# --- using MS IIS ----------------
+	# set to 1 if you use IIS
+	$g_use_iis = 0;
+
 	#############################
 	### Mantis Version String ###
 	#############################
diff --git a/core_print_API.php b/core_print_API.php
index 84dd450fc8..e4410a1c24 100644
--- a/core_print_API.php
+++ b/core_print_API.php
@@ -12,12 +12,18 @@
 
 	### --------------------
 	function print_header_redirect( $p_url ) {
+		global $g_use_iis;
+
 		header( "Status: 302" );
 		header( "Content-Type: text/html" );
 		header( "Pragma: no-cache" );
 		header( "Expires: Fri, 01 Jan 1999 00:00:00 GMT" );
 		header( "Cache-control: no-cache, no-cache=\"Set-Cookie\", private" );
-		header( "Location: $p_url" );
+		if ( $g_use_iis == 1 ) {
+			header( "Refresh: 0;url=$p_url" );
+		} else {
+			header( "Location: $p_url" );
+		}
 	}
 	### --------------------
 	# prints the name of the user given the id.  also makes it an email link.