diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index a428037d71e719caec738cb004a027f8b7a358b3..82bc0c69b507a022b26966271a32c7277c9ef724 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -24,8 +24,13 @@ set(SRC
   onelabUtils.cpp
   GamePad.cpp
   GmshRemote.cpp
-  gmshLocalNetworkClient.cpp
 )
 
+if(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
+  set(SRC
+    ${SRC}
+    gmshLocalNetworkClient.cpp)
+endif(ENABLE_ONELAB AND NOT ENABLE_ONELAB2)
+
 file(GLOB HDR RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.h) 
 append_gmsh_src(Common "${SRC};${HDR}")
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index de6a0850fb735f0dedfa45e47d5ab83b37495742..76738b55f44db7a17fc3dacc91dd84081849b5d0 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -33,7 +33,9 @@ typedef unsigned long intptr_t;
 #include "fieldWindow.h"
 #include "pluginWindow.h"
 #include "helpWindow.h"
-#if not defined(HAVE_ONELAB2)
+#if defined(HAVE_ONELAB2)
+#include "OnelabWindow.h"
+#else
 #include "gmshLocalNetworkClient.h"
 #endif
 #include "fileDialogs.h"
@@ -1977,6 +1979,9 @@ static Fl_Menu_Item bar_table[] = {
     {0},
   {"&Tools", 0, 0, 0, FL_SUBMENU},
     {"&Options",         FL_CTRL+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0},
+#if defined(HAVE_ONELAB2)
+    {"&Onelab2",         0, (Fl_Callback *)onelab2_cb, 0},
+#endif
     {"Pl&ugins",         FL_CTRL+FL_SHIFT+'u', (Fl_Callback *)plugin_cb, (void*)(-1)},
     {"&Visibility",      FL_CTRL+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
     {"&Clipping",        FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0},