diff --git a/pcbnew/exporters/gen_drill_report_files.cpp b/pcbnew/exporters/gen_drill_report_files.cpp
index 19e8481c1f..2e392fa0e9 100644
--- a/pcbnew/exporters/gen_drill_report_files.cpp
+++ b/pcbnew/exporters/gen_drill_report_files.cpp
@@ -34,6 +34,7 @@
 #include <math/util.h>      // for KiROUND
 
 #include <board.h>
+#include <footprint.h>
 
 #include <pcbplot.h>
 #include <gendrill_file_writer_base.h>
@@ -258,6 +259,31 @@ bool GENDRILL_WRITER_BASE::genDrillMapFile( const wxString& aFullFileName, PLOT_
         }
     }
 
+    // Plot edge cuts in footprints
+    for( const FOOTPRINT* footprint : m_pcb->Footprints() )
+    {
+        for( BOARD_ITEM* item : footprint->GraphicalItems() )
+        {
+            if( item-> GetLayer() != Edge_Cuts )
+                continue;
+
+            switch( item->Type() )
+            {
+            case PCB_SHAPE_T:
+                {
+                PCB_SHAPE dummy_shape( *static_cast<PCB_SHAPE*>( item ) );
+                dummy_shape.SetLayer( Dwgs_User );
+                dummy_shape.SetParentGroup( nullptr );      // Remove group association, not needed for plotting
+                itemplotter.PlotShape( &dummy_shape );
+                }
+                break;
+
+            default:
+                break;
+            }
+        }
+    }
+
     int      plotX, plotY, TextWidth;
     int      intervalle = 0;
     char     line[1024];