diff --git a/out/boot.dol b/out/boot.dol
index fd58a2e8..1e282446 100644
Binary files a/out/boot.dol and b/out/boot.dol differ
diff --git a/source/menu/menu.cpp b/source/menu/menu.cpp
index 57991509..f997bacc 100644
--- a/source/menu/menu.cpp
+++ b/source/menu/menu.cpp
@@ -272,6 +272,7 @@ bool CMenu::init(bool usb_mounted)
 	m_helpDir = m_cfg.getString("GENERAL", "dir_help", fmt("%s/help", m_dataDir.c_str()));
 	m_screenshotDir = m_cfg.getString("GENERAL", "dir_screenshot", fmt("%s/screenshots", m_dataDir.c_str()));
 	
+	m_wiiTDBDir = m_cfg.getString("GENERAL", "dir_wiitdb", fmt("%s",m_settingsDir.c_str()));
 	m_boxPicDir = m_cfg.getString("GENERAL", "dir_box_covers", fmt("%s/boxcovers", m_dataDir.c_str()));
 	m_picDir = m_cfg.getString("GENERAL", "dir_flat_covers", fmt("%s/covers", m_dataDir.c_str()));
 	m_themeDir = m_cfg.getString("GENERAL", "dir_themes_lite", fmt("%s/themes_lite", m_dataDir.c_str()));
diff --git a/source/menu/menu.hpp b/source/menu/menu.hpp
index 722c3843..905dd8cf 100644
--- a/source/menu/menu.hpp
+++ b/source/menu/menu.hpp
@@ -147,6 +147,7 @@ private:
 	string m_helpDir;
 	string m_screenshotDir;
 	
+	string m_wiiTDBDir;
 	string m_boxPicDir;
 	string m_picDir;
 	string m_themeDir;
diff --git a/source/menu/menu_download.cpp b/source/menu/menu_download.cpp
index d96e59a9..9a276c01 100644
--- a/source/menu/menu_download.cpp
+++ b/source/menu/menu_download.cpp
@@ -1602,7 +1602,7 @@ int CMenu::_gametdbDownloaderAsync()
 		{
 			update_pThread(1); // It's downloaded
 			bool res = false;
-			char *zippath = fmt_malloc("%s/wiitdb.zip", m_settingsDir.c_str());
+			char *zippath = fmt_malloc("%s/wiitdb.zip", m_wiiTDBDir.c_str());
 			if(zippath != NULL)
 			{
 				gprintf("Writing file to '%s'\n", zippath);
@@ -1629,7 +1629,7 @@ int CMenu::_gametdbDownloaderAsync()
 				m_thrdMessage = wfmt(_fmt("dlmsg24", L"Extracting %s"), "wiitdb.zip");
 				m_thrdMessageAdded = true;
 				ZipFile zFile(zippath);
-				bool zres = zFile.ExtractAll(m_settingsDir.c_str());
+				bool zres = zFile.ExtractAll(m_wiiTDBDir.c_str());
 				gprintf(zres ? "success\n" : "failed\n");
 				// May add if zres failed return -4 extraction failed
 
@@ -1638,7 +1638,7 @@ int CMenu::_gametdbDownloaderAsync()
 				MEM2_free(zippath);
 
 				// We should always remove the offsets file to make sure it's reloaded
-				fsop_deleteFile(fmt("%s/gametdb_offsets.bin", m_settingsDir.c_str()));
+				fsop_deleteFile(fmt("%s/gametdb_offsets.bin", m_wiiTDBDir.c_str()));
 
 				update_pThread(1); // It's extracted
 
diff --git a/source/menu/menu_paths.cpp b/source/menu/menu_paths.cpp
index e71777d6..f9497e22 100644
--- a/source/menu/menu_paths.cpp
+++ b/source/menu/menu_paths.cpp
@@ -54,10 +54,11 @@ void CMenu::_showPaths(void)
 	m_btnMgr.show(m_configBtn2);
 	m_btnMgr.show(m_configLbl3);
 	m_btnMgr.show(m_configBtn3);
+	m_btnMgr.show(m_configLbl4);
+	m_btnMgr.show(m_configBtn4);
+		
 	if(paths_curPage == 1)
 	{
-		m_btnMgr.show(m_configLbl4);
-		m_btnMgr.show(m_configBtn4);
 		m_btnMgr.setText(m_configLbl1, _t("cfgp8", L"Box Covers"));
 		m_btnMgr.setText(m_configLbl2, _t("cfgp2", L"Flat Covers"));
 		m_btnMgr.setText(m_configLbl3, _t("cfgp9", L"Custom Banners"));
@@ -68,6 +69,7 @@ void CMenu::_showPaths(void)
 		m_btnMgr.setText(m_configLbl1, _t("cfgp5", L"Wii Games"));
 		m_btnMgr.setText(m_configLbl2, _t("cfgp6", L"GameCube Games"));
 		m_btnMgr.setText(m_configLbl3, _t("cfgp7", L"Music"));
+		m_btnMgr.setText(m_configLbl4, _t("cfgp10", L"WiiTDB Zip"));
 	}
 }
 
@@ -203,7 +205,7 @@ void CMenu::_Paths(void)
 				}
 				_showPaths();
 			}
-			if (m_btnMgr.selected(m_configBtn3))
+			else if (m_btnMgr.selected(m_configBtn3))
 			{
 				_hidePaths();
 				path = _FolderExplorer(m_cfg.getString("GENERAL", "dir_music").c_str());
@@ -216,6 +218,17 @@ void CMenu::_Paths(void)
 				}
 				_showPaths();
 			}
+			else if (m_btnMgr.selected(m_configBtn4))
+			{
+				_hidePaths();
+				path = _FolderExplorer(m_cfg.getString("GENERAL", "dir_wiitdb").c_str());
+				if(strlen(path) > 0)
+				{
+					m_cfg.setString("GENERAL", "dir_wiitdb", path);
+					m_wiiTDBDir = path;
+				}
+				_showPaths();
+			}
 		}
 	}
 	_hidePaths();
diff --git a/wii/wiiflow/Languages/english.ini b/wii/wiiflow/Languages/english.ini
index 8eea1173..8fa850d6 100644
--- a/wii/wiiflow/Languages/english.ini
+++ b/wii/wiiflow/Languages/english.ini
@@ -224,6 +224,7 @@ cfgp6=GC Games
 cfgp7=Music
 cfgp8=Box Covers
 cfgp9=Custom Banners
+cfgp10=WiiTDB Zip
 cfgpl1=Select Plugins
 cfgpl2=Set All
 cfgpl3=Clear All