diff --git a/plugins/GSdx/GSState.cpp b/plugins/GSdx/GSState.cpp
index 166aef74bc..227fd16128 100644
--- a/plugins/GSdx/GSState.cpp
+++ b/plugins/GSdx/GSState.cpp
@@ -65,8 +65,8 @@ GSState::GSState()
 	m_dump_root = "";
 #if defined(__unix__)
 	if (s_dump) {
-		GSmkdir("/tmp/GS_HW_dump");
-		GSmkdir("/tmp/GS_SW_dump");
+		GSmkdir(root_hw.c_str());
+		GSmkdir(root_sw.c_str());
 	}
 #endif
 
diff --git a/plugins/GSdx/stdafx.h b/plugins/GSdx/stdafx.h
index 776d271c56..08a11afc4f 100644
--- a/plugins/GSdx/stdafx.h
+++ b/plugins/GSdx/stdafx.h
@@ -472,6 +472,11 @@ struct GLAutoPop {
 const std::string root_sw("c:\\temp1\\_");
 const std::string root_hw("c:\\temp2\\_");
 #else
-const std::string root_sw("/tmp/GS_SW_dump/");
-const std::string root_hw("/tmp/GS_HW_dump/");
+#ifdef _M_AMD64
+const std::string root_sw("/tmp/GS_SW_dump64/");
+const std::string root_hw("/tmp/GS_HW_dump64/");
+#else
+const std::string root_sw("/tmp/GS_SW_dump32/");
+const std::string root_hw("/tmp/GS_HW_dump32/");
+#endif
 #endif