diff --git a/README.md b/README.md
index 884eee7d72..6afb1425b1 100644
--- a/README.md
+++ b/README.md
@@ -47,7 +47,7 @@ RetroArch requires these libraries to build:
 RetroArch can utilize these libraries if enabled:
 
    - nvidia-cg-toolkit
-   - libxml2 (bSNES XML shaders)
+   - libxml2 (GLSL XML shaders)
    - libfreetype2 (TTF font rendering on screen)
    - libsamplerate
 
diff --git a/config.def.h b/config.def.h
index 691ccf6e0c..57f5e90780 100644
--- a/config.def.h
+++ b/config.def.h
@@ -291,7 +291,6 @@ static const float audio_volume = 0.0;
 //////////////
 
 // Enables use of rewind. This will incur some memory footprint depending on the save state buffer.
-// This rewind only works when using bSNES core atm.
 static const bool rewind_enable = false;
 
 // The buffer size for the rewind buffer. This needs to be about 15-20MB per minute. Very game dependant.
diff --git a/gfx/gl.c b/gfx/gl.c
index eeb5352e64..cf1de1fc0c 100644
--- a/gfx/gl.c
+++ b/gfx/gl.c
@@ -228,7 +228,7 @@ static bool gl_shader_init(void *data)
       case RARCH_SHADER_AUTO:
       {
          if (*g_settings.video.cg_shader_path && *g_settings.video.bsnes_shader_path)
-            RARCH_WARN("Both Cg and bSNES XML shader are defined in config file. Cg shader will be selected by default.\n");
+            RARCH_WARN("Both Cg and GLSL XML shader are defined in config file. Cg shader will be selected by default.\n");
 
 #ifdef HAVE_CG
          if (*g_settings.video.cg_shader_path)
diff --git a/pandora/retroarch/retroarch.cfg b/pandora/retroarch/retroarch.cfg
index 202db4bd34..cf443c1261 100644
--- a/pandora/retroarch/retroarch.cfg
+++ b/pandora/retroarch/retroarch.cfg
@@ -82,7 +82,7 @@ video_aspect_ratio_auto = true
 # Forces cropping of overscanned frames. Crops away top 7 scanlines and 8 bottom scanlines. (15/15 for interlaced frames).
 # video_crop_overscan = false
 
-# Path to bSNES XML shader (GLSL only).
+# Path to GLSL XML shader.
 # video_bsnes_shader = "/path/to/bsnes/xml/shader.shader"
 
 # Which shader type to use. Valid values are "bsnes", "none" and "auto"
@@ -330,7 +330,6 @@ input_player1_r_y_minus_axis = -3
 #### Misc
 
 # Enable rewinding. This will take a performance hit when playing, so it is disabled by default.
-# Do note that rewinding will only work properly when using bSNES libretro core atm.
 # rewind_enable = false
 
 # Rewinding buffer size in megabytes. Bigger rewinding buffer means you can rewind longer.
diff --git a/retroarch.cfg b/retroarch.cfg
index d94dfc2d27..be4b198cfe 100644
--- a/retroarch.cfg
+++ b/retroarch.cfg
@@ -87,7 +87,7 @@
 # Path to Cg shader.
 # video_cg_shader = "/path/to/cg/shader.cg"
 
-# Path to bSNES XML shader (GLSL only). If both Cg shader path and XML shader path are defined, 
+# Path to GLSL XML shader. If both Cg shader path and XML shader path are defined, 
 # Cg shader will take priority unless overridden in video_shader_type.
 # video_bsnes_shader = "/path/to/bsnes/xml/shader.shader"