diff --git a/src/Config.cpp b/src/Config.cpp
index cd5c2741..2e21a597 100644
--- a/src/Config.cpp
+++ b/src/Config.cpp
@@ -94,11 +94,9 @@ void Config::resetToDefaults()
 #elif defined (OS_ANDROID)
 	font.name.assign("DroidSans.ttf");
 #elif defined (PANDORA)
-	font.name.assign("truetype/LiberationMono-Regular.ttf");
-#elif defined (OS_LINUX)
-	font.name.assign("liberation/LiberationMono-Regular.ttf");
+	font.name.assign("LiberationMono-Regular.ttf");
 #else
-	font.name.assign("truetype/freefont/FreeSans.ttf");
+	font.name = "FreeSans.ttf";
 #endif
 	font.size = 18;
 	font.color[0] = 0xB5;
diff --git a/src/TextDrawer.cpp b/src/TextDrawer.cpp
index e81b25f2..ec1a644b 100644
--- a/src/TextDrawer.cpp
+++ b/src/TextDrawer.cpp
@@ -201,11 +201,9 @@ bool getFontFileName(char * _strName)
 #elif defined (OS_ANDROID)
 	sprintf(_strName, "/system/fonts/%s", config.font.name.c_str());
 #elif defined (PANDORA)
-	sprintf(_strName, "/usr/share/fonts/%s", config.font.name.c_str());
-#elif defined (OS_LINUX)
-	sprintf(_strName, "/usr/share/fonts/%s", config.font.name.c_str());
+	sprintf(_strName, "/usr/share/fonts/truetype/%s", config.font.name.c_str());
 #else
-	sprintf(_strName, "/usr/share/fonts/%s", config.font.name.c_str());
+    sprintf(_strName, "/usr/share/fonts/truetype/freefont/%s", config.font.name.c_str());
 #endif
 	return true;
 }