diff --git a/CMakeLists.txt b/CMakeLists.txt
index d5c0c6761..ea542c37f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,11 +110,12 @@ if(MSVC)
   add_definitions(-DNOMINMAX=1)
   add_definitions(-DBOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE=1)
 else()
+  # Assumes compilers which recognize GCC and clang speak
   add_compile_options(-pedantic)
+  add_compile_options(-fstrict-aliasing)
   add_compile_options(-Wall)
   add_compile_options(-Wextra)
   add_compile_options(-Wstrict-aliasing)
-  add_compile_options(-fstrict-aliasing)
   add_compile_options(-Wconversion )
   add_compile_options(-Wsign-promo)
   add_compile_options(-Wfloat-equal)
diff --git a/Jamfile b/Jamfile
index db1f1f504..73e5759f3 100644
--- a/Jamfile
+++ b/Jamfile
@@ -14,9 +14,9 @@ project boost-gil
         <toolset>msvc:<cxxflags>"/W4"
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE <define>_CRT_SECURE_NO_WARNINGS <define>_CRT_NONSTDC_NO_DEPRECATE <define>NOMINMAX
         <toolset>intel:<debug-symbols>off
-        <toolset>gcc:<cxxflags>"-std=c++11 -pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>darwin:<cxxflags>"-std=c++11 -pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wconversion -Wfloat-equal -Wshadow"
-        <toolset>clang:<cxxflags>"-std=c++11 -pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter -Wsign-conversion -Wconversion -Wfloat-equal -Wshadow"
+        <toolset>gcc:<cxxflags>"-std=c++11 -pedantic -fstrict-aliasing -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter "
+        <toolset>darwin:<cxxflags>"-std=c++11 -pedantic -fstrict-aliasing -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter "
+        <toolset>clang:<cxxflags>"-std=c++11 -pedantic -fstrict-aliasing -Wconversion -Wextra -Wfloat-equal -Wshadow -Wsign-promo -Wstrict-aliasing -Wunused-parameter -Wsign-conversion"
     ;
 
 build-project example ;