diff --git a/CMakeLists.txt b/CMakeLists.txt
index d6ff5b279c..82c039fd52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,8 @@ option(KICAD_SCRIPTING_WXPYTHON
 # python binary file should be is exec path.
 
 
+option(USE_FP_LIB_TABLE "Use the new footprint library table implementation. (default OFF)")
+
 #Set version option (stable or testing)
 
 if(KICAD_STABLE_VERSION AND KICAD_TESTING_VERSION )
diff --git a/CMakeModules/config.h.cmake b/CMakeModules/config.h.cmake
index e16fa0091d..4914b6c417 100644
--- a/CMakeModules/config.h.cmake
+++ b/CMakeModules/config.h.cmake
@@ -85,4 +85,7 @@
 #define LEGACY_BOARD_FILE_VERSION          1
 #endif
 
+/// Definition to compile with Pcbnew footprint library table implementation.
+#cmakedefine USE_FP_LIB_TABLE
+
 #endif  // CONFIG_H_
diff --git a/Documentation/compiling/build-config.txt b/Documentation/compiling/build-config.txt
index aee4c1b42e..ae9a450370 100644
--- a/Documentation/compiling/build-config.txt
+++ b/Documentation/compiling/build-config.txt
@@ -142,3 +142,11 @@ PYTHON_SITE_PACKAGE_PATH (PATH)
 When building KiCad with Python scripting enable, the Python site library path
 is used by default.  If you want to install the KiCad Python extension in a
 different path, set this variable to the desired path.
+
+
+USE_FP_LIB_TABLE (ON/OFF)
+-------------------------
+This option enable or disables building KiCad with the new footprint library
+table support.  The default setting (OFF) builds KiCad with the legacy library
+path support.  This option is experimental until the library table support is
+ready for release.
diff --git a/TODO.txt b/TODO.txt
index f47cd0e39b..9b10dc8bef 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -81,7 +81,6 @@ EESchema
 * Drag and drop between two EESchema windows.
 
 Wayne:
-E2)  Finish adding replace capability to new Find dialog.
 E3)  Hook up perform last library search hot key to replace search libraries for
      component support removed from find dialog.
 E4)  Change add component dialog search text control to combobox and add component
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index a8e7164f03..722bece58d 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -165,9 +165,9 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
 
     // Specctra Session
     AddMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION,
-                           _( "&Specctra Session" ),
-                           _( "Import a routed \"Specctra Session\" (*.ses) file" ),
-                           KiBitmap( import_xpm ) );
+                 _( "&Specctra Session" ),
+                 _( "Import a routed \"Specctra Session\" (*.ses) file" ),
+                 KiBitmap( import_xpm ) );
 
     AddMenuItem( filesMenu, submenuImport,
                  ID_GEN_IMPORT_FILE, _( "&Import" ),
@@ -421,13 +421,15 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     wxMenu* configmenu = new wxMenu;
 
     // Library
+#if !defined( USE_FP_LIB_TABLE )
     AddMenuItem( configmenu, ID_CONFIG_REQ,
                  _( "Li&brary" ), _( "Setting libraries, directories and others..." ),
                  KiBitmap( library_xpm ) );
-
+#else
     AddMenuItem( configmenu, ID_PCB_LIB_TABLE_EDIT,
                 _( "Li&brary Tables" ), _( "Setup footprint libraries" ),
                 KiBitmap( library_table_xpm ) );
+#endif
 
     // Colors and Visibility are also handled by the layers manager toolbar
     AddMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG,