diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h
index d7b2c09b5e..43971a89de 100644
--- a/include/wxPcbStruct.h
+++ b/include/wxPcbStruct.h
@@ -810,6 +810,7 @@ public:
     bool DoGenFootprintsReport( const wxString& aFullFilename, bool aUnitsMM );
 
     void InstallDrillFrame( wxCommandEvent& event );
+    void GenD356File( wxCommandEvent& event );
     void ToPostProcess( wxCommandEvent& event );
 
     void OnFileHistory( wxCommandEvent& event );
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 59fcb0209c..37a671744b 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -155,6 +155,7 @@ set( PCBNEW_CLASS_SRCS
     edit_track_width.cpp
     edtxtmod.cpp
     event_handlers_tracks_vias_sizes.cpp
+    export_d356.cpp
     export_gencad.cpp
     export_vrml.cpp
     files.cpp
diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp
index a63c652b5a..b4ef6f6407 100644
--- a/pcbnew/menubar_pcbframe.cpp
+++ b/pcbnew/menubar_pcbframe.cpp
@@ -141,6 +141,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
                  _( "Create a report of all modules on the current board" ),
                  KiBitmap( tools_xpm ) );
 
+    AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_D356_FILE,
+		 _( "IPC-D-356 Netlist File" ),
+		 _( "Generate IPC-D-356 netlist file" ),
+                 KiBitmap( netlist_xpm ) );
+
     // Component File
     AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE,
                  _( "&Component (.cmp) File" ),
diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp
index 9bce32510e..ed6795639b 100644
--- a/pcbnew/pcbframe.cpp
+++ b/pcbnew/pcbframe.cpp
@@ -136,6 +136,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME )
     // menu Postprocess
     EVT_MENU( ID_PCB_GEN_POS_MODULES_FILE, PCB_EDIT_FRAME::GenFootprintsPositionFile )
     EVT_MENU( ID_PCB_GEN_DRILL_FILE, PCB_EDIT_FRAME::InstallDrillFrame )
+    EVT_MENU( ID_PCB_GEN_D356_FILE, PCB_EDIT_FRAME::GenD356File )
     EVT_MENU( ID_PCB_GEN_CMP_FILE, PCB_EDIT_FRAME::RecreateCmpFileFromBoard )
     EVT_MENU( ID_PCB_GEN_BOM_FILE_FROM_BOARD, PCB_EDIT_FRAME::RecreateBOMFileFromBoard )
 
diff --git a/pcbnew/pcbnew_id.h b/pcbnew/pcbnew_id.h
index 8d89a6116a..7ca2e561d6 100644
--- a/pcbnew/pcbnew_id.h
+++ b/pcbnew/pcbnew_id.h
@@ -260,6 +260,7 @@ enum pcbnew_ids
 
     ID_PCB_GEN_POS_MODULES_FILE,
     ID_PCB_GEN_DRILL_FILE,
+    ID_PCB_GEN_D356_FILE,
 
     ID_PCB_PAD_SETUP,