diff --git a/debian-unstable-upstream/patches/02_update_default_path.patch b/debian-unstable-upstream/patches/02_update_default_path.patch
index bb7cbf6118..24f349fb31 100644
--- a/debian-unstable-upstream/patches/02_update_default_path.patch
+++ b/debian-unstable-upstream/patches/02_update_default_path.patch
@@ -1,12 +1,11 @@
 Debian policy.
-This patch updates default plugin path and config path.
-It also updates the pcsx2 game db path and shaders data path.
-AppInit.cpp:93 could be probably updated
-Index: pcsx2.snapshot-4169/pcsx2/gui/AppConfig.cpp
+This patch updates default plugin path, game db path.
+It also updates shaders data path.
+Index: pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
 ===================================================================
---- pcsx2.snapshot-4169.orig/pcsx2/gui/AppConfig.cpp
-+++ pcsx2.snapshot-4169/pcsx2/gui/AppConfig.cpp
-@@ -143,7 +143,8 @@
+--- pcsx2.snapshot-4292.orig/pcsx2/gui/AppConfig.cpp
++++ pcsx2.snapshot-4292/pcsx2/gui/AppConfig.cpp
+@@ -164,7 +164,8 @@
  
  	wxDirName GetPlugins()
  	{
@@ -15,11 +14,11 @@ Index: pcsx2.snapshot-4169/pcsx2/gui/AppConfig.cpp
 +		return wxDirName( L"/usr/lib/games/pcsx2" ) + Base::Plugins();
  	}
  
- 	wxDirName GetSettings()
-Index: pcsx2.snapshot-4169/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+ 	wxDirName GetThemes()
+Index: pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
 ===================================================================
---- pcsx2.snapshot-4169.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
-+++ pcsx2.snapshot-4169/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
+--- pcsx2.snapshot-4292.orig/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
++++ pcsx2.snapshot-4292/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
 @@ -291,18 +291,23 @@
  
  __forceinline bool LoadShadersFromDat()
@@ -53,10 +52,10 @@ Index: pcsx2.snapshot-4169/plugins/zzogl-pg/opengl/ZZoglCreate.cpp
  
  	fseek(fres, 0, SEEK_END);
  
-Index: pcsx2.snapshot-4169/pcsx2/gui/AppGameDatabase.h
+Index: pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
 ===================================================================
---- pcsx2.snapshot-4169.orig/pcsx2/gui/AppGameDatabase.h
-+++ pcsx2.snapshot-4169/pcsx2/gui/AppGameDatabase.h
+--- pcsx2.snapshot-4292.orig/pcsx2/gui/AppGameDatabase.h
++++ pcsx2.snapshot-4292/pcsx2/gui/AppGameDatabase.h
 @@ -51,8 +51,8 @@
  		Console.WriteLn( "(GameDB) Unloading..." );
  	}
diff --git a/debian-unstable-upstream/patches/05_move_data_to_config.patch b/debian-unstable-upstream/patches/05_move_data_to_config.patch
index b3a27dfa21..43ca8a1748 100644
--- a/debian-unstable-upstream/patches/05_move_data_to_config.patch
+++ b/debian-unstable-upstream/patches/05_move_data_to_config.patch
@@ -1,3 +1,4 @@
+By default, move all users datas into XDG_CONFIG_DIR
 Index: pcsx2.snapshot-3369/pcsx2/gui/AppConfig.cpp
 ===================================================================
 --- pcsx2.snapshot-3369.orig/pcsx2/gui/AppConfig.cpp
diff --git a/debian-unstable-upstream/rules b/debian-unstable-upstream/rules
index 2c18a6a600..29b513b272 100755
--- a/debian-unstable-upstream/rules
+++ b/debian-unstable-upstream/rules
@@ -32,7 +32,7 @@ build-stamp:
 		-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
 		-DL10N_PORTABLE=FALSE \
 		-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
-		-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
+		-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" \
 		-DCMAKE_INSTALL_PREFIX="/usr" \
 		-DPACKAGE_MODE=TRUE
 	$(MAKE) $(MAKEFLAGS)
diff --git a/debian-unstable-upstream/rules_fglrx b/debian-unstable-upstream/rules_fglrx
index 958a0567be..8ca418c8ad 100755
--- a/debian-unstable-upstream/rules_fglrx
+++ b/debian-unstable-upstream/rules_fglrx
@@ -32,7 +32,9 @@ build-stamp:
 		-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
 		-DL10N_PORTABLE=FALSE \
 		-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
-		-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
+		-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)" \
+		-DCMAKE_INSTALL_PREFIX="/usr" \
+		-DPACKAGE_MODE=TRUE
 	$(MAKE) $(MAKEFLAGS)
 
 	touch build-stamp