diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp
index 042d988bfa..4459b0b6f6 100644
--- a/pcbnew/menubar_pcb_editor.cpp
+++ b/pcbnew/menubar_pcb_editor.cpp
@@ -833,8 +833,8 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
     //----- Import submenu ------------------------------------------------------
     wxMenu* submenuImport = new wxMenu();
 
-    AddMenuItem( aParentMenu, ID_GET_NETLIST,
-                 _( "Import &Netlist..." ),
+    AddMenuItem( submenuImport, ID_GET_NETLIST,
+                 _( "&Netlist..." ),
                  _( "Read netlist and update board connectivity" ),
                  KiBitmap( netlist_xpm ) );
 
@@ -844,7 +844,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
                  KiBitmap( import_xpm ) );
 
     AddMenuItem( submenuImport, ID_GEN_IMPORT_GRAPHICS_FILE,
-                 _( "Import &Graphics..." ),
+                 _( "&Graphics..." ),
                  _( "Import 2D Drawing file to Pcbnew on Drawings layer" ),
                  KiBitmap( import_xpm ) );
 
@@ -864,18 +864,23 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
 
     //----- Fabrication Outputs submenu -----------------------------------------
     wxMenu* fabricationOutputsMenu = new wxMenu;
-    AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
-                 _( "Footprint &Position (.pos) File..." ),
-                 _( "Generate footprint position file for pick and place" ),
+    AddMenuItem( fabricationOutputsMenu, ID_GEN_PLOT_GERBER,
+                 _( "&Gerbers (.gbr)..." ),
+                 _( "Generate Gerbers for fabrication" ),
                  KiBitmap( post_compo_xpm ) );
 
     AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE,
-                 _( "&Drill (.drl) File..." ),
-                 _( "Generate excellon2 drill file" ),
+                 _( "&Drill Files (.drl)..." ),
+                 _( "Generate excellon2 drill file(s)" ),
                  KiBitmap( post_drill_xpm ) );
 
+    AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
+                 _( "Footprint &Positions (.pos)..." ),
+                 _( "Generate footprint position file for pick and place" ),
+                 KiBitmap( post_compo_xpm ) );
+
     AddMenuItem( fabricationOutputsMenu, ID_GEN_EXPORT_FILE_MODULE_REPORT,
-                 _( "&Footprint (.rpt) Report..." ),
+                 _( "&Footprint Report (.rpt)..." ),
                  _( "Create report of all footprints from current board" ),
                  KiBitmap( tools_xpm ) );
 
@@ -885,7 +890,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
                  KiBitmap( netlist_xpm ) );
 
     AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD,
-                 _( "&BOM File..." ),
+                 _( "&BOM..." ),
                  _( "Create bill of materials from current schematic" ),
                  KiBitmap( bom_xpm ) );
 
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index b4db36fb53..16ad1fc845 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -121,6 +121,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
     EVT_MENU_RANGE( ID_FILE1, ID_FILEMAX, PCB_EDIT_FRAME::OnFileHistory )
 
     EVT_MENU( ID_GEN_PLOT, PCB_EDIT_FRAME::ToPlotter )
+    EVT_MENU( ID_GEN_PLOT_GERBER, PCB_EDIT_FRAME::ToPlotter )
 
     EVT_MENU( ID_GEN_EXPORT_SPECCTRA, PCB_EDIT_FRAME::ExportToSpecctra )
     EVT_MENU( ID_GEN_EXPORT_FILE_GENCADFORMAT, PCB_EDIT_FRAME::ExportToGenCAD )
@@ -1098,8 +1099,23 @@ void PCB_EDIT_FRAME::OnSwitchCanvas( wxCommandEvent& aEvent )
     syncRenderStates();
 }
 
+
 void PCB_EDIT_FRAME::ToPlotter( wxCommandEvent& event )
 {
+    PCB_PLOT_PARAMS plotSettings = GetPlotSettings();
+
+    switch( event.GetId() )
+    {
+    case ID_GEN_PLOT_GERBER: plotSettings.SetFormat( PLOT_FORMAT_GERBER ); break;
+    case ID_GEN_PLOT_DXF:    plotSettings.SetFormat( PLOT_FORMAT_DXF );    break;
+    case ID_GEN_PLOT_HPGL:   plotSettings.SetFormat( PLOT_FORMAT_HPGL );   break;
+    case ID_GEN_PLOT_PDF:    plotSettings.SetFormat( PLOT_FORMAT_PDF );    break;
+    case ID_GEN_PLOT_PS:     plotSettings.SetFormat( PLOT_FORMAT_POST );   break;
+    case ID_GEN_PLOT_SVG:    wxFAIL_MSG( "Should have gone to ExportSVG()" );  break;
+    }
+
+    SetPlotSettings( plotSettings );
+
     // Force rebuild the dialog if currently open because the old dialog can be not up to date
     // if the board (or units) has changed
     wxWindow* dlg =  wxWindow::FindWindowByName( DLG_WINDOW_NAME );