diff --git a/ahbot.patch b/ahbot.patch
index 04ed752..e197d1d 100644
--- a/ahbot.patch
+++ b/ahbot.patch
@@ -1,3 +1,62 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32edeb3458..35385f2271 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,6 +46,27 @@ if(EXISTS "conf/config.cmake")
+   include(conf/config.cmake)
+ endif()
+ 
++#
++# Loading dyn modules
++#
++
++# add modules and dependencies
++CU_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
++FOREACH(subdir ${sub_DIRS})
++
++    get_filename_component(MODULENAME ${subdir} NAME)
++
++    if (";${DISABLED_AC_MODULES};" MATCHES ";${MODULENAME};")
++       continue()
++    endif()
++
++    STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir_rel ${subdir})
++    if(EXISTS "${subdir}/CMakeLists.txt")
++        message("Loading module: ${subdir_rel}")
++        add_subdirectory("${subdir_rel}")
++    endif()
++ENDFOREACH()
++
+ CU_RUN_HOOK("AFTER_LOAD_CONF")
+ 
+ # build in Release-mode by default if not explicitly set
+@@ -107,26 +128,6 @@ if( TOOLS )
+   add_subdirectory(src/tools)
+ endif()
+ 
+-#
+-# Loading dyn modules
+-#
+-
+-# add modules and dependencies
+-CU_SUBDIRLIST(sub_DIRS  "${CMAKE_SOURCE_DIR}/modules" FALSE FALSE)
+-FOREACH(subdir ${sub_DIRS})
+-
+-    get_filename_component(MODULENAME ${subdir} NAME)
+-
+-    if (";${DISABLED_AC_MODULES};" MATCHES ";${MODULENAME};")
+-       continue()
+-    endif()
+-
+-    STRING(REGEX REPLACE "^${CMAKE_SOURCE_DIR}/" "" subdir_rel ${subdir})
+-    if(EXISTS "${subdir}/CMakeLists.txt")
+-        message("Loading module: ${subdir_rel}")
+-        add_subdirectory("${subdir_rel}")
+-    endif()
+-ENDFOREACH()
+ 
+ #
+ # Loading application sources
 diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp b/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
 index 4aba5703b2..5c9a332016 100644
 --- a/src/server/game/AuctionHouse/AuctionHouseMgr.cpp
@@ -97,7 +156,7 @@ index ef72cbfe2c..2f57ac9687 100644
  
      //expire time if COD 3 days, if no COD 30 days, if auction sale pending 1 hour
 diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
-index 01b1fe0acb..cf3e65bc94 100644
+index 01b1fe0acb..38b0e5fc90 100644
 --- a/src/server/game/World/World.cpp
 +++ b/src/server/game/World/World.cpp
 @@ -76,6 +76,9 @@
@@ -110,12 +169,16 @@ index 01b1fe0acb..cf3e65bc94 100644
  
  ACE_Atomic_Op<ACE_Thread_Mutex, bool> World::m_stopEvent = false;
  uint8 World::m_ExitCode = SHUTDOWN_EXIT_CODE;
-@@ -1635,6 +1638,16 @@ void World::SetInitialWorldSettings()
+@@ -1635,6 +1638,20 @@ void World::SetInitialWorldSettings()
      sLog->outString("Loading Completed Achievements...");
      sAchievementMgr->LoadCompletedAchievements();
  
 +#ifdef MOD_AH_BOT
-+    std::string cfg_file = "mod_ahbot.conf";
++    std::string conf_path = _CONF_DIR;
++    std::string cfg_file = conf_path + "/mod_ahbot.conf";
++#ifdef WIN32
++    cfg_file = "mod_ahbot.conf";
++#endif
 +    std::string cfg_def_file = cfg_file + ".dist";
 +    sConfigMgr->LoadMore(cfg_def_file.c_str());
 +    sConfigMgr->LoadMore(cfg_file.c_str());
@@ -127,19 +190,19 @@ index 01b1fe0acb..cf3e65bc94 100644
      ///- Load dynamic data tables from the database
      sLog->outString("Loading Item Auctions...");
      sAuctionMgr->LoadAuctionItems();
-@@ -1871,6 +1884,11 @@ void World::SetInitialWorldSettings()
+@@ -1871,6 +1888,11 @@ void World::SetInitialWorldSettings()
      mgr = ChannelMgr::forTeam(TEAM_HORDE);
      mgr->LoadChannels();
  
 +#ifdef MOD_AH_BOT
-+    TC_LOG_INFO("server.loading", "Initialize AuctionHouseBot...");
++    sLog->outString("Initialize AuctionHouseBot...");
 +    auctionbot->Initialize();
 +#endif
 +
      uint32 startupDuration = GetMSTimeDiffToNow(startupBegin);
      sLog->outString();
      sLog->outError("WORLD: World initialized in %u minutes %u seconds", (startupDuration / 60000), ((startupDuration % 60000) / 1000));
-@@ -2031,6 +2049,9 @@ void World::Update(uint32 diff)
+@@ -2031,6 +2053,9 @@ void World::Update(uint32 diff)
          // pussywizard: handle auctions when the timer has passed
          if (m_timers[WUPDATE_AUCTIONS].Passed())
          {