diff --git a/CMakeLists.txt b/CMakeLists.txt
index f46efa66ef..3900bf068b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -148,7 +148,10 @@ endif(EXISTS "${PROJECT_SOURCE_DIR}/plugins")
 #-------------------------------------------------------------------------------
 # Install some files to ease package creation
 if(PACKAGE_MODE)
-    INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
+    INSTALL(FILES     "${PROJECT_SOURCE_DIR}/bin/GameIndex.dbf" DESTINATION "${GAMEINDEX_DIR}")
+    INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/bin/cheats"        DESTINATION "${GAMEINDEX_DIR}")
+    INSTALL(DIRECTORY "${PROJECT_SOURCE_DIR}/bin/cheats_ws"     DESTINATION "${GAMEINDEX_DIR}")
+
     INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.desktop" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications")
     INSTALL(FILES "${PROJECT_SOURCE_DIR}/linux_various/pcsx2.xpm" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/pixmaps")
     INSTALL(FILES "${PROJECT_SOURCE_DIR}/bin/docs/PCSX2_FAQ.pdf" DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/pcsx2")
diff --git a/pcsx2/gui/AppConfig.cpp b/pcsx2/gui/AppConfig.cpp
index 3f7f25b009..56b50bef17 100644
--- a/pcsx2/gui/AppConfig.cpp
+++ b/pcsx2/gui/AppConfig.cpp
@@ -159,12 +159,28 @@ namespace PathDefs
 
 	wxDirName GetBios()
 	{
-		return GetDocuments() + wxDirName( L"bios" );
+		// Each linux distributions have his rules for path so we give them the possibility to
+		// change it with compilation flags. -- Gregory
+#ifndef PLUGIN_DIR_COMPILATION
+		return AppRoot() + wxDirName( L"bios" );
+#else
+#define xPLUGIN_DIR_str(s) PLUGIN_DIR_str(s)
+#define PLUGIN_DIR_str(s) #s
+		return wxDirName( xPLUGIN_DIR_str(PLUGIN_DIR_COMPILATION) );
+#endif
 	}
 
 	wxDirName GetCheats()
 	{
-		return GetDocuments() + wxDirName( L"cheats" );
+		// Each linux distributions have his rules for path so we give them the possibility to
+		// change it with compilation flags. -- Gregory
+#ifndef PLUGIN_DIR_COMPILATION
+		return AppRoot() + wxDirName( L"cheats" );
+#else
+#define xPLUGIN_DIR_str(s) PLUGIN_DIR_str(s)
+#define PLUGIN_DIR_str(s) #s
+		return wxDirName( xPLUGIN_DIR_str(PLUGIN_DIR_COMPILATION) );
+#endif
 	}
 
 	wxDirName GetCheatsWS()