diff --git a/cake/bootstrap.php b/cake/bootstrap.php
index 8e07f96c2..561597204 100644
--- a/cake/bootstrap.php
+++ b/cake/bootstrap.php
@@ -29,9 +29,6 @@
 if (!defined('PHP5')) {
 	define ('PHP5', (phpversion() >= 5));
 }
-if (!defined('SERVER_IIS') && php_sapi_name() == 'isapi') {
-	define('SERVER_IIS', true);
-}
 /**
  * Configuration, directory layout and standard libraries
  */
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
index 9f17d2410..8da8a41ad 100644
--- a/cake/libs/configure.php
+++ b/cake/libs/configure.php
@@ -602,6 +602,10 @@ class Configure extends Object {
 		if ($boot) {
 			$_this->write('App', array('base' => false, 'baseUrl' => false, 'dir' => APP_DIR, 'webroot' => WEBROOT_DIR));
 
+			if (php_sapi_name() == 'isapi') {
+				$_this->write('App.server', 'IIS');
+			}
+
 			if (!include(APP_PATH . 'config' . DS . 'core.php')) {
 				trigger_error(sprintf(__("Can't find application core file. Please create %score.php, and make sure it is readable by PHP.", true), CONFIGS), E_USER_ERROR);
 			}