diff --git a/AudioUnit.cpp b/AudioUnit.cpp
index 1d81fca..276e956 100644
--- a/AudioUnit.cpp
+++ b/AudioUnit.cpp
@@ -44,7 +44,7 @@ void CAudioUnit::initialise()
 {
 }
 
-void CAudioUnit::setLanguage(TEXT_LANG language)
+void CAudioUnit::setLanguage(const std::string & dir, TEXT_LANG language)
 {
 	m_language = language;
 
@@ -94,14 +94,14 @@ void CAudioUnit::setLanguage(TEXT_LANG language)
 			break;
 	}
 
-	bool ret = readAMBE(ambeFileName);
+	bool ret = readAMBE(dir, ambeFileName);
 	if (!ret) {
 		delete[] m_ambe;
 		m_ambe = NULL;
 		return;
 	}
 
-	ret = readIndex(indxFileName);
+	ret = readIndex(dir, indxFileName);
 	if (!ret) {
 		delete[] m_ambe;
 		m_ambe = NULL;
diff --git a/AudioUnit.h b/AudioUnit.h
index 6cfe95f..6cdd862 100644
--- a/AudioUnit.h
+++ b/AudioUnit.h
@@ -82,7 +82,7 @@ public:
 
 	static void initialise();
 
-	static void setLanguage(TEXT_LANG language);
+	static void setLanguage(const std::string & dir, TEXT_LANG language);
 
 	static void finalise();
 
diff --git a/DStarGatewayThread.cpp b/DStarGatewayThread.cpp
index e814d4b..0102d63 100644
--- a/DStarGatewayThread.cpp
+++ b/DStarGatewayThread.cpp
@@ -290,7 +290,7 @@ void* CDStarGatewayThread::Entry()
 	if (m_restrictList != NULL)
 		CRepeaterHandler::setRestrictList(m_restrictList);
 
-	CAudioUnit::setLanguage(m_language);
+	CAudioUnit::setLanguage(m_dataDir, m_language);
 
 #ifdef USE_STARNET
 	CStarNetHandler::setCache(&m_cache);