diff --git a/linux_various/glsl2h.pl b/linux_various/glsl2h.pl
index 4adb3c1b45..3af99197f2 100755
--- a/linux_various/glsl2h.pl
+++ b/linux_various/glsl2h.pl
@@ -37,14 +37,17 @@ eval {
 ########################
 # GSdx
 ########################
-my @gsdx_res = qw/convert.glsl interlace.glsl merge.glsl shadeboost.glsl tfx_vgs.glsl tfx_fs_all.glsl fxaa.fx/;
 my $gsdx_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "GSdx", "res");
+my $gsdx_out = File::Spec->catdir($gsdx_path, "glsl_source.h");
+
 # Just a hack to reuse glsl2h function easily
+$gsdx_path = File::Spec->catdir(dirname(abs_path($0)), "..", "plugins", "GSdx", "res", "glsl");
 my @tfx_res = qw/tfx_fs.glsl tfx_fs_subroutine.glsl/;
 my $tfx_all = File::Spec->catdir($gsdx_path, "tfx_fs_all.glsl");
+
+my @gsdx_res = qw/convert.glsl interlace.glsl merge.glsl shadeboost.glsl tfx_vgs.glsl tfx_fs_all.glsl fxaa.fx/;
 concat($gsdx_path, $tfx_all, \@tfx_res);
 
-my $gsdx_out = File::Spec->catdir($gsdx_path, "glsl_source.h");
 glsl2h($gsdx_path, $gsdx_out, \@gsdx_res);
 
 unlink $tfx_all;
diff --git a/plugins/GSdx/res/convert.glsl b/plugins/GSdx/res/glsl/convert.glsl
similarity index 100%
rename from plugins/GSdx/res/convert.glsl
rename to plugins/GSdx/res/glsl/convert.glsl
diff --git a/plugins/GSdx/res/glsl/fxaa.fx b/plugins/GSdx/res/glsl/fxaa.fx
new file mode 120000
index 0000000000..f8a26fe1af
--- /dev/null
+++ b/plugins/GSdx/res/glsl/fxaa.fx
@@ -0,0 +1 @@
+../fxaa.fx
\ No newline at end of file
diff --git a/plugins/GSdx/res/interlace.glsl b/plugins/GSdx/res/glsl/interlace.glsl
similarity index 100%
rename from plugins/GSdx/res/interlace.glsl
rename to plugins/GSdx/res/glsl/interlace.glsl
diff --git a/plugins/GSdx/res/merge.glsl b/plugins/GSdx/res/glsl/merge.glsl
similarity index 100%
rename from plugins/GSdx/res/merge.glsl
rename to plugins/GSdx/res/glsl/merge.glsl
diff --git a/plugins/GSdx/res/shadeboost.glsl b/plugins/GSdx/res/glsl/shadeboost.glsl
similarity index 100%
rename from plugins/GSdx/res/shadeboost.glsl
rename to plugins/GSdx/res/glsl/shadeboost.glsl
diff --git a/plugins/GSdx/res/tfx_fs.glsl b/plugins/GSdx/res/glsl/tfx_fs.glsl
similarity index 100%
rename from plugins/GSdx/res/tfx_fs.glsl
rename to plugins/GSdx/res/glsl/tfx_fs.glsl
diff --git a/plugins/GSdx/res/tfx_fs_subroutine.glsl b/plugins/GSdx/res/glsl/tfx_fs_subroutine.glsl
similarity index 100%
rename from plugins/GSdx/res/tfx_fs_subroutine.glsl
rename to plugins/GSdx/res/glsl/tfx_fs_subroutine.glsl
diff --git a/plugins/GSdx/res/tfx_vgs.glsl b/plugins/GSdx/res/glsl/tfx_vgs.glsl
similarity index 100%
rename from plugins/GSdx/res/tfx_vgs.glsl
rename to plugins/GSdx/res/glsl/tfx_vgs.glsl