diff --git a/Changelog b/Changelog
index 20d5d3566..1812866af 100755
--- a/Changelog
+++ b/Changelog
@@ -1,4 +1,5 @@
 2017-11-23 DariusIII
+	* Chg: Remove bootstrap.php from nntmux folder and add its contents to bootstrap/autoload.php
 	* Chg: Optimize autoloder
 2017-11-22 DariusIII
 	* Chg: Update Category class
diff --git a/bootstrap/autoload.php b/bootstrap/autoload.php
index 8fad617fe..9881940af 100644
--- a/bootstrap/autoload.php
+++ b/bootstrap/autoload.php
@@ -2,10 +2,11 @@
 
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'vendor'.DIRECTORY_SEPARATOR.'autoload.php';
 require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'constants.php';
-require_once dirname(__DIR__).DIRECTORY_SEPARATOR.'nntmux'.DIRECTORY_SEPARATOR.'bootstrap.php';
 require __DIR__.DIRECTORY_SEPARATOR.'app.php';
 
 use Dotenv\Dotenv;
+use nntmux\utility\Utility;
+use nntmux\config\Configure;
 
 $dotenv = new Dotenv(dirname(__DIR__, 1));
 $dotenv->load();
@@ -18,5 +19,11 @@ if (! defined('NN_ROOT')) {
     define('NN_ROOT', dirname(NN_APP_PATH, 2));
 }
 
+if (! defined('HAS_WHICH')) {
+    define('HAS_WHICH', Utility::hasWhich() ? true : false);
+}
+
+new Configure('indexer');
+
 $app->make(Illuminate\Contracts\Console\Kernel::class)->bootstrap();
 require_once __DIR__.DIRECTORY_SEPARATOR.'yenc.php';
diff --git a/nntmux/bootstrap.php b/nntmux/bootstrap.php
deleted file mode 100755
index a0e672d45..000000000
--- a/nntmux/bootstrap.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program (see LICENSE.txt in the base directory.  If
- * not, see:
- *
- * @link      <http://www.gnu.org/licenses/>.
- * @author    niel
- * @copyright 2016 nZEDb
- */
-require_once NN_ROOT.'vendor/autoload.php';
-
-use nntmux\utility\Utility;
-use nntmux\config\Configure;
-
-if (! defined('HAS_WHICH')) {
-    define('HAS_WHICH', Utility::hasWhich() ? true : false);
-}
-
-new Configure('indexer');