diff --git a/Makefile b/Makefile
index 8a03f6f32..65fe77191 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -Wconversion -g
+CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
 CXX=g++
 BIN=${DESTDIR}/usr/bin
 
diff --git a/tools/dmake.cpp b/tools/dmake.cpp
index 008fc8265..7b648df9b 100644
--- a/tools/dmake.cpp
+++ b/tools/dmake.cpp
@@ -152,7 +152,7 @@ int main(int argc, char **argv)
     else
     {
         // TODO: add more compiler warnings.
-        // -Wsign-conversion : generates too many compiler warnings currently
+        // -Wconversion      : generates too many compiler warnings currently
         // -Wlogical-op      : doesn't work on older GCC
 
         // The _GLIBCXX_DEBUG doesn't work in cygwin
@@ -165,7 +165,7 @@ int main(int argc, char **argv)
              << "-Wfloat-equal "
              << "-Wcast-qual "
              << "-Wsign-conversion "
-             << "-Wconversion "
+             // << "-Wconversion "
              << "-g\n";
     }
     fout << "CXX=g++\n";