diff --git a/src/core/BandLimitedWave.cpp b/src/core/BandLimitedWave.cpp
index de608ba1d..b60cbd633 100644
--- a/src/core/BandLimitedWave.cpp
+++ b/src/core/BandLimitedWave.cpp
@@ -67,7 +67,7 @@ void BandLimitedWave::generateWaves()
 	int i;
 
 // set wavetable directory
-	s_wavetableDir = ConfigManager::inst()->dataDir() + "wavetables/";
+	s_wavetableDir = "data:wavetables/";
 
 // set wavetable files
 	QFile saw_file( s_wavetableDir + "saw.bin" );
diff --git a/src/core/ConfigManager.cpp b/src/core/ConfigManager.cpp
index 22df6f3d5..bc9a50b48 100644
--- a/src/core/ConfigManager.cpp
+++ b/src/core/ConfigManager.cpp
@@ -63,6 +63,9 @@ ConfigManager::ConfigManager() :
 	m_flDir( QDir::home().absolutePath() ),
 	m_recoveryFile( QDir(m_workingDir).absoluteFilePath("recover.mmp") )
 {
+	if (! qgetenv("LMMS_DATA_DIR").isEmpty())
+		QDir::addSearchPath("data", QString::fromLocal8Bit(qgetenv("LMMS_DATA_DIR")));
+	QDir::addSearchPath("data", m_dataDir);
 }