diff --git a/pcbnew/dialogs/dialog_plot.cpp b/pcbnew/dialogs/dialog_plot.cpp
index 401eed6065..bc13af8558 100644
--- a/pcbnew/dialogs/dialog_plot.cpp
+++ b/pcbnew/dialogs/dialog_plot.cpp
@@ -94,6 +94,10 @@ void DIALOG_PLOT::Init_Dialog()
     case PLOT_FORMAT_HPGL:
         m_plotFormatOpt->SetSelection( 4 );
         break;
+
+    case PLOT_FORMAT_PDF:
+        m_plotFormatOpt->SetSelection( 5 );
+        break;
     }
 
     msg = ReturnStringFromValue( g_UserUnit, m_brdSettings.m_SolderMaskMargin, true );
@@ -610,7 +614,7 @@ void DIALOG_PLOT::applyPlotSettings()
     {
         msg = ReturnStringFromValue( g_UserUnit, tempOptions.GetLineWidth() );
         m_linesWidth->SetValue( msg );
-        msg.Printf( _( "Default linewidth constrained!\n" ) );
+        msg.Printf( _( "Default line width constrained!\n" ) );
         m_messagesBox->AppendText( msg );
     }
 
@@ -790,12 +794,13 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event )
 
             LOCALE_IO toggle;
             BOARD *board = m_parent->GetBoard();
-            PLOTTER *plotter = StartPlotBoard(board, &m_plotOpts,
-                                              fn.GetFullPath(),
-                                              wxEmptyString );
+            PLOTTER *plotter = StartPlotBoard( board, &m_plotOpts,
+                                               fn.GetFullPath(),
+                                               wxEmptyString );
 
             // Print diags in messages box:
             wxString msg;
+
             if( plotter )
             {
                 PlotOneBoardLayer( board, plotter, layer, m_plotOpts );
diff --git a/pcbnew/dialogs/dialog_plot_base.cpp b/pcbnew/dialogs/dialog_plot_base.cpp
index d83691bd4c..7d1e54bec4 100644
--- a/pcbnew/dialogs/dialog_plot_base.cpp
+++ b/pcbnew/dialogs/dialog_plot_base.cpp
@@ -28,7 +28,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	m_staticText121->Wrap( -1 );
 	bSizer27->Add( m_staticText121, 0, wxTOP, 5 );
 	
-	wxString m_plotFormatOptChoices[] = { _("Gerber"), _("Postscript"), _("SVG"), _("DXF"), _("HPGL") };
+	wxString m_plotFormatOptChoices[] = { _("Gerber"), _("Postscript"), _("SVG"), _("DXF"), _("HPGL"), _("PDF") };
 	int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
 	m_plotFormatOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 0 );
 	m_plotFormatOpt->SetSelection( 0 );
@@ -186,7 +186,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr
 	m_PlotOptionsSizer->Add( sbOptionsSizer, 0, wxALL|wxEXPAND, 3 );
 	
 	wxStaticBoxSizer* sbSizerSoldMaskLayerOpt;
-	sbSizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Solder mask current settings:") ), wxVERTICAL );
+	sbSizerSoldMaskLayerOpt = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Current solder mask settings:") ), wxVERTICAL );
 	
 	wxFlexGridSizer* fgSizerSoldMaskOpts;
 	fgSizerSoldMaskOpts = new wxFlexGridSizer( 2, 2, 0, 0 );
diff --git a/pcbnew/dialogs/dialog_plot_base.fbp b/pcbnew/dialogs/dialog_plot_base.fbp
index 07dfeb0af1..2137a6813a 100644
--- a/pcbnew/dialogs/dialog_plot_base.fbp
+++ b/pcbnew/dialogs/dialog_plot_base.fbp
@@ -219,7 +219,7 @@
                                                 <property name="caption"></property>
                                                 <property name="caption_visible">1</property>
                                                 <property name="center_pane">0</property>
-                                                <property name="choices">&quot;Gerber&quot; &quot;Postscript&quot; &quot;SVG&quot; &quot;DXF&quot; &quot;HPGL&quot;</property>
+                                                <property name="choices">&quot;Gerber&quot; &quot;Postscript&quot; &quot;SVG&quot; &quot;DXF&quot; &quot;HPGL&quot; &quot;PDF&quot;</property>
                                                 <property name="close_button">1</property>
                                                 <property name="context_help"></property>
                                                 <property name="context_menu">1</property>
@@ -2318,7 +2318,7 @@
                                             <property name="proportion">1</property>
                                             <object class="wxStaticBoxSizer" expanded="1">
                                                 <property name="id">wxID_ANY</property>
-                                                <property name="label">Solder mask current settings:</property>
+                                                <property name="label">Current solder mask settings:</property>
                                                 <property name="minimum_size"></property>
                                                 <property name="name">sbSizerSoldMaskLayerOpt</property>
                                                 <property name="orient">wxVERTICAL</property>
@@ -2676,11 +2676,11 @@
                                                 </object>
                                             </object>
                                         </object>
-                                        <object class="sizeritem" expanded="0">
+                                        <object class="sizeritem" expanded="1">
                                             <property name="border">3</property>
                                             <property name="flag">wxALL|wxEXPAND</property>
                                             <property name="proportion">0</property>
-                                            <object class="wxStaticBoxSizer" expanded="0">
+                                            <object class="wxStaticBoxSizer" expanded="1">
                                                 <property name="id">wxID_ANY</property>
                                                 <property name="label">Gerber Options</property>
                                                 <property name="minimum_size"></property>