diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 145233c18f..d0fe8934d0 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -1334,8 +1334,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
             for( size_t i = 0; i < count; i++ )
             {
                 int          index = plotOnAllLayers.Item( i );
-                PCB_LAYER_ID client_layer =
-                        getLayerClientData( m_plotAllLayersList, index )->Layer();
+                PCB_LAYER_ID client_layer = getLayerClientData( m_plotAllLayersList, index )->Layer();
 
                 commonLayers.push_back( client_layer );
             }
diff --git a/pcbnew/pcb_plotter.cpp b/pcbnew/pcb_plotter.cpp
index bb801a411b..1142567bc2 100644
--- a/pcbnew/pcb_plotter.cpp
+++ b/pcbnew/pcb_plotter.cpp
@@ -146,7 +146,7 @@ bool PCB_PLOTTER::Plot( const wxString& aOutputPath,
         else
         {
             wxFileName brdFn = m_board->GetFileName();
-            fn.Assign( aOutputPath, brdFn.GetName() );
+            fn.Assign( aOutputPath, brdFn.GetName(), fileExt );
 
             // Use Gerber Extensions based on layer number
             // (See http://en.wikipedia.org/wiki/Gerber_File)