diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp
index b4ff0e8ba4..b143908c32 100644
--- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
+++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp	
@@ -18,6 +18,8 @@
           <Add option="-O0"/>
           <Add option="-std=gnu++0x"/>
           <Add option="-march=pentium4"/>
+          <Add option="-mstackrealign"/>
+          <Add option="-g"/>
           <Add option="-D__MINGW__=1"/>
           <Add option="-D__MINGW_EXTENSION="/>
           <Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/>
@@ -50,6 +52,7 @@
           <Add option="-Os"/>
           <Add option="-std=gnu++0x"/>
           <Add option="-march=pentium4"/>
+          <Add option="-mstackrealign"/>
           <Add option="-D__MINGW__=1"/>
           <Add option="-D__MINGW_EXTENSION="/>
           <Add option="-DJUCER_CODEBLOCKS_20734A5D=1"/>
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h
index 3f7bd77dee..ea9eba17f3 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_CodeBlocks.h	
@@ -136,6 +136,9 @@ private:
         flags.add ("-march=pentium4");
         flags.add ("-mstackrealign");
 
+        if (config.isDebug())
+            flags.add ("-g");
+
         flags.addTokens (replacePreprocessorTokens (config, getExtraCompilerFlagsString()).trim(),
                          " \n", "\"'");
 
@@ -186,6 +189,7 @@ private:
         if (type.isCommandLineApp()) return 1;
         if (type.isStaticLibrary())  return 2;
         if (type.isDynamicLibrary()) return 3;
+        if (type.isAudioPlugin())    return 3;
         return 0;
     }
 
diff --git a/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp b/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp
index a80f4c4926..c72d110235 100644
--- a/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp	
+++ b/extras/JuceDemo/Builds/CodeBlocks/Juce Demo.cbp	
@@ -18,6 +18,8 @@
           <Add option="-O0"/>
           <Add option="-std=gnu++0x"/>
           <Add option="-march=pentium4"/>
+          <Add option="-mstackrealign"/>
+          <Add option="-g"/>
           <Add option="-D__MINGW__=1"/>
           <Add option="-D__MINGW_EXTENSION="/>
           <Add option="-DJUCE_UNIT_TESTS=1"/>
@@ -52,6 +54,7 @@
           <Add option="-Os"/>
           <Add option="-std=gnu++0x"/>
           <Add option="-march=pentium4"/>
+          <Add option="-mstackrealign"/>
           <Add option="-D__MINGW__=1"/>
           <Add option="-D__MINGW_EXTENSION="/>
           <Add option="-DJUCE_UNIT_TESTS=1"/>