diff --git a/admin_check.php b/admin/admin_check.php
similarity index 98%
rename from admin_check.php
rename to admin/admin_check.php
index b2579a54c0..0943ec7f28 100644
--- a/admin_check.php
+++ b/admin/admin_check.php
@@ -1,3 +1,8 @@
+<?php
+	require( "../constant_inc.php" );
+	require( "../config_inc.php" );
+	require( "../core_database_API.php" );
+?>
 <?php
 	error_reporting( E_ALL );
 
@@ -59,7 +64,6 @@ function print_yes_no( $p_result ) {
 </style>
 </head>
 <body>
-<?php include( "core_API.php" ) ?>
 
 <h2>Admin Check</h2>
 
diff --git a/admin_upgrade.php b/admin/admin_upgrade.php
similarity index 92%
rename from admin_upgrade.php
rename to admin/admin_upgrade.php
index d2046b20a4..454ac84207 100644
--- a/admin_upgrade.php
+++ b/admin/admin_upgrade.php
@@ -1,4 +1,8 @@
-<?php require_once( "core_API.php" ) ?>
+<?php
+	require( "../constant_inc.php" );
+	require( "../config_inc.php" );
+	require( "../core_database_API.php" );
+?>
 <h1>Mantis Database Upgrade</h1>
 <b>WARNING:</b> - Always backup your database data before upgrading.  From the command line you can do this with the mysqldump command.
 <p>
diff --git a/admin_upgrade_0_14_0.php b/admin/admin_upgrade_0_14_0.php
similarity index 97%
rename from admin_upgrade_0_14_0.php
rename to admin/admin_upgrade_0_14_0.php
index 3519fd261d..f5b17595a2 100644
--- a/admin_upgrade_0_14_0.php
+++ b/admin/admin_upgrade_0_14_0.php
@@ -1,4 +1,8 @@
-<?php include( "core_API.php" ) ?>
+<?php
+	require( "../constant_inc.php" );
+	require( "../config_inc.php" );
+	require( "../core_database_API.php" );
+?>
 <?php
         db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
 ?>
diff --git a/admin_upgrade_0_15_0.php b/admin/admin_upgrade_0_15_0.php
similarity index 99%
rename from admin_upgrade_0_15_0.php
rename to admin/admin_upgrade_0_15_0.php
index 56970c548a..efb28c309a 100644
--- a/admin_upgrade_0_15_0.php
+++ b/admin/admin_upgrade_0_15_0.php
@@ -1,8 +1,7 @@
 <?php
-	require( "constant_inc.php" );
-	require( "config_inc.php" );
-
-	require( "core_database_API.php" );
+	require( "../constant_inc.php" );
+	require( "../config_inc.php" );
+	require( "../core_database_API.php" );
 ?>
 <?php
 	db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
diff --git a/admin_upgrade_0_16_0.php b/admin/admin_upgrade_0_16_0.php
similarity index 95%
rename from admin_upgrade_0_16_0.php
rename to admin/admin_upgrade_0_16_0.php
index 7b9cdcf4b0..0838f2fab4 100644
--- a/admin_upgrade_0_16_0.php
+++ b/admin/admin_upgrade_0_16_0.php
@@ -1,7 +1,7 @@
 <?php
-	require( "constant_inc.php" );
-	require( "config_inc.php" );
-	require( "core_database_API.php" );
+	require( "../constant_inc.php" );
+	require( "../config_inc.php" );
+	require( "../core_database_API.php" );
 ?>
 <?php
 	db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
diff --git a/admin_upgrade_0_17_0.php b/admin/admin_upgrade_0_17_0.php
similarity index 95%
rename from admin_upgrade_0_17_0.php
rename to admin/admin_upgrade_0_17_0.php
index c7528a23ea..a0fd0cbcfe 100644
--- a/admin_upgrade_0_17_0.php
+++ b/admin/admin_upgrade_0_17_0.php
@@ -1,7 +1,7 @@
 <?php
-	require( "constant_inc.php" );
-	require( "config_inc.php" );
-	require( "core_database_API.php" );
+	require( "../constant_inc.php" );
+	require( "../config_inc.php" );
+	require( "../core_database_API.php" );
 ?>
 <?php
 	db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
diff --git a/admin_upgrade_0_18_0.php b/admin/admin_upgrade_0_18_0.php
similarity index 100%
rename from admin_upgrade_0_18_0.php
rename to admin/admin_upgrade_0_18_0.php
diff --git a/admin_upgrade_inc.php b/admin/admin_upgrade_inc.php
similarity index 96%
rename from admin_upgrade_inc.php
rename to admin/admin_upgrade_inc.php
index be894cbe92..a5f6ca82db 100644
--- a/admin_upgrade_inc.php
+++ b/admin/admin_upgrade_inc.php
@@ -1,7 +1,7 @@
 <?php
-	require_once( 'constant_inc.php' );
-	require_once( 'config_inc.php' );
-	require_once( 'core_database_API.php' );
+	require_once( '../constant_inc.php' );
+	require_once( '../config_inc.php' );
+	require_once( '../core_database_API.php' );
 ?>
 <?php
 	db_connect( $g_hostname, $g_db_username, $g_db_password, $g_database_name );
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 3246cd734a..35707a428c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -57,6 +57,7 @@ Mantis
  * Enhanced the admin_upgrade.php script, and supported auto-generation of SQL files.
  * In the view bugs, when all projects is selected the project name is now displayed in smaller font over the category.
  * Added support for optional compression of html output ($g_compress_html).  This option is OFF by default since it requires PHP 4.04.
+ * Moved admin_* scripts into admin/ folder.
 
 2002.05.19  -  0.17.3
 
