diff --git a/src/openflow/CMakeLists.txt b/src/openflow/CMakeLists.txt
index 876c92509..7a61af780 100644
--- a/src/openflow/CMakeLists.txt
+++ b/src/openflow/CMakeLists.txt
@@ -50,7 +50,11 @@ set(NS3_OPENFLOW
           "ON if Openflow is found in NS3_WITH_OPENFLOW"
 )
 
-add_compile_options(-Wno-stringop-truncation)
+if(${GCC})
+  add_compile_options(-Wno-stringop-truncation) # This option does not exist in CLANG
+elseif(${CLANG})
+  add_compile_options(-Wno-reserved-user-defined-literal)
+endif()
 
 build_lib(
   LIBNAME openflow
diff --git a/src/openflow/doc/openflow-switch.rst b/src/openflow/doc/openflow-switch.rst
index 923815e05..2773da6a0 100644
--- a/src/openflow/doc/openflow-switch.rst
+++ b/src/openflow/doc/openflow-switch.rst
@@ -146,8 +146,8 @@ To do this:
 
    From the "openflow" directory, run::
      
-     $ ./ns3 configure
-     $ ./ns3 build
+     $ ./waf configure
+     $ ./waf build
 
 2. Your OFSID is now built into a libopenflow.a library!
    To link to an ns-3 build with this OpenFlow switch module, run from the ns-3-dev