diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84cef306e..b561815ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,6 +20,12 @@ set (OPENMW_VERSION_RELEASE 0)
 
 set (OPENMW_VERSION "${OPENMW_VERSION_MAJOR}.${OPENMW_VERSION_MINOR}.${OPENMW_VERSION_RELEASE}")
 
+# Debug suffix for plugins
+set(DEBUG_SUFFIX "")
+if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+    set(DEBUG_SUFFIX "_d")
+endif()
+
 # doxygen main page
 
 configure_file ("${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp.cmake" "${OpenMW_SOURCE_DIR}/Docs/mainpage.hpp")
diff --git a/files/plugins.cfg.linux b/files/plugins.cfg.linux
index f34621a0f..bbce1f1b4 100644
--- a/files/plugins.cfg.linux
+++ b/files/plugins.cfg.linux
@@ -4,9 +4,8 @@
 PluginFolder=${OGRE_PLUGIN_DIR_REL}
 
 # Define plugins
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager
-
+Plugin=RenderSystem_GL${OGRE_RenderSystem_GL_LIBRARIES}
+Plugin=Plugin_ParticleFX${DEBUG_SUFFIX}
+Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX}
+Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX}
 
diff --git a/files/plugins.cfg.mac b/files/plugins.cfg.mac
index 322070832..fac18dc8f 100644
--- a/files/plugins.cfg.mac
+++ b/files/plugins.cfg.mac
@@ -4,9 +4,9 @@
 PluginFolder=${OGRE_PLUGIN_DIR}
 
 # Define plugins
-Plugin=RenderSystem_GL.1.8.0
-Plugin=Plugin_ParticleFX.1.8.0
-Plugin=Plugin_OctreeSceneManager.1.8.0
-Plugin=Plugin_CgProgramManager.1.8.0
+Plugin=RenderSystem_GL${DEBUG_SUFFIX}.1.8.0
+Plugin=Plugin_ParticleFX${DEBUG_SUFFIX}.1.8.0
+Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX}.1.8.0
+Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX}.1.8.0
 
 
diff --git a/files/plugins.cfg.win32 b/files/plugins.cfg.win32
index ea12c0394..6b4e9ef9d 100644
--- a/files/plugins.cfg.win32
+++ b/files/plugins.cfg.win32
@@ -4,10 +4,10 @@
 PluginFolder=.\
 
 # Define plugins
-Plugin=RenderSystem_Direct3D9
-Plugin=RenderSystem_GL
-Plugin=Plugin_ParticleFX
-Plugin=Plugin_OctreeSceneManager
-Plugin=Plugin_CgProgramManager
+Plugin=RenderSystem_Direct3D9${DEBUG_SUFFIX}
+Plugin=RenderSystem_GL${DEBUG_SUFFIX}
+Plugin=Plugin_ParticleFX${DEBUG_SUFFIX}
+Plugin=Plugin_OctreeSceneManager${DEBUG_SUFFIX}
+Plugin=Plugin_CgProgramManager${DEBUG_SUFFIX}