diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51b3b7f8..8f7a04bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,8 +20,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Export Project: problems when downloading KiCad models and trying to compress
   the result.
 - PcbDraw: problems with 0 ohms THT resistors (#689)
-- PCB Print: allow specifying `repeat_for_layer` with empty `repeat_layers`.
-  This was the old behavior (i.e. 1.7.0) (#671)
+- PCB Print:
+  - Allow specifying `repeat_for_layer` with empty `repeat_layers`.
+    This was the old behavior (i.e. 1.7.0) (#671)
+  - Problems with drill marks on KiCad 8.0.4+, which prints them in every
+    single layer (even technical ones) (#696)
 - Expansion of internal field names. KiCad expands "VALUE", not "Value", which
   is what you see in the GUI
 
diff --git a/docs/source/Changelog.rst b/docs/source/Changelog.rst
index 5e1728a6..6347fff9 100644
--- a/docs/source/Changelog.rst
+++ b/docs/source/Changelog.rst
@@ -35,8 +35,13 @@ Fixed
 -  Export Project: problems when downloading KiCad models and trying to
    compress the result.
 -  PcbDraw: problems with 0 ohms THT resistors (#689)
--  PCB Print: allow specifying ``repeat_for_layer`` with empty
-   ``repeat_layers``. This was the old behavior (i.e. 1.7.0) (#671)
+-  PCB Print:
+
+   -  Allow specifying ``repeat_for_layer`` with empty
+      ``repeat_layers``. This was the old behavior (i.e. 1.7.0) (#671)
+   -  Problems with drill marks on KiCad 8.0.4+, which prints them in
+      every single layer (even technical ones) (#696)
+
 -  Expansion of internal field names. KiCad expands “VALUE”, not
    “Value”, which is what you see in the GUI
 
diff --git a/kibot/out_pcb_print.py b/kibot/out_pcb_print.py
index f83c297c..f032e219 100644
--- a/kibot/out_pcb_print.py
+++ b/kibot/out_pcb_print.py
@@ -507,6 +507,7 @@ def plot_frame_api(self, pc, po, p):
         po.SetPlotFrameRef(True)
         po.SetScale(1.0)
         po.SetNegative(False)
+        po.SetDrillMarksType(0)
         pc.SetLayer(self.cleared_layer)
         pc.OpenPlotfile('frame', PLOT_FORMAT_SVG, p.sheet)
         pc.PlotLayer()
@@ -541,6 +542,8 @@ def plot_frame_internal(self, pc, po, p, page, pages):
         po.SetPlotFrameRef(False)
         po.SetScale(1.0)
         po.SetNegative(False)
+        # We don't want drill marks in the frame
+        po.SetDrillMarksType(0)
         # Trying to set the color mode here doesn't change the mode (GetColorMode() returns False)
         # pc.SetColorMode(True)
         pc.SetLayer(self.cleared_layer)