diff --git a/cli/cli.pro b/cli/cli.pro
index b71023069..3e3da246d 100644
--- a/cli/cli.pro
+++ b/cli/cli.pro
@@ -26,9 +26,8 @@ win32 {
 }
 
 # Add more strict compiling flags for GCC
-# These flags are used in original (not generated by QMake) makefiles
 contains(QMAKE_CXX, g++) {
-    QMAKE_CXXFLAGS_WARN_ON += -Wextra -pedantic
+    QMAKE_CXXFLAGS_WARN_ON += -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wsign-conversion -Wlogical-op
 
     CONFIG(debug, debug|release) {
         # checked STL
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 394befe2f..5ed404f17 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
 
     // Makefile settings..
     fout << "CXXFLAGS=-Wall -Wextra -pedantic -Wfloat-equal -Wcast-qual -Wsign-conversion -Wlogical-op ";
-    fout << (release ? "-O2 -DNDEBUG" : "-g") << "\n";
+    fout << (release ? "-O2 -DNDEBUG" : "-g -D_GLIBCXX_DEBUG") << "\n";
     fout << "CXX=g++\n";
     fout << "BIN=${DESTDIR}/usr/bin\n\n";
     fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml\n";