diff --git a/src/Mod/TechDraw/CMakeLists.txt b/src/Mod/TechDraw/CMakeLists.txt
index 1678c83be8..b4a796218b 100644
--- a/src/Mod/TechDraw/CMakeLists.txt
+++ b/src/Mod/TechDraw/CMakeLists.txt
@@ -21,14 +21,17 @@ set(TechDraw_ToolsScripts
     TechDrawTools/CommandMoveView.py
     TechDrawTools/CommandShareView.py
     TechDrawTools/CommandAxoLengthDimension.py
+    TechDrawTools/CommandHoleShaftFit.py
     TechDrawTools/TaskMoveView.py
     TechDrawTools/TaskShareView.py
+    TechDrawTools/TaskHoleShaftFit.py
     TechDrawTools/TDToolsUtil.py
     TechDrawTools/TDToolsMovers.py
 )
 
 set(TechDraw_ToolsGui
     Gui/TaskMoveView.ui
+    Gui/TaskHoleShaftFit.ui
     Gui/DlgPageChooser.ui
 )
 
diff --git a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
index b142946ba5..aa405f1538 100644
--- a/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
+++ b/src/Mod/TechDraw/Gui/Resources/TechDraw.qrc
@@ -29,6 +29,7 @@
         <file>icons/actions/TechDraw_Midpoints.svg</file>
         <file>icons/actions/TechDraw_MoveView.svg</file>
         <file>icons/actions/TechDraw_AxoLengthDimension.svg</file>
+        <file>icons/actions/TechDraw_HoleShaftFit.svg</file>
         <file>icons/actions/TechDraw_Multiview.svg</file>
         <file>icons/actions/TechDraw_PageDefault.svg</file>
         <file>icons/actions/TechDraw_PageTemplate.svg</file>
diff --git a/src/Mod/TechDraw/Gui/Workbench.cpp b/src/Mod/TechDraw/Gui/Workbench.cpp
index 9ba7b30a03..00559b6e0d 100644
--- a/src/Mod/TechDraw/Gui/Workbench.cpp
+++ b/src/Mod/TechDraw/Gui/Workbench.cpp
@@ -226,6 +226,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
     *draw << "TechDraw_ShowAll";
     *draw << "TechDraw_WeldSymbol";
     *draw << "TechDraw_SurfaceFinishSymbols";
+    *draw << "TechDraw_HoleShaftFit";
     *draw << "Separator";
     *draw << "TechDraw_ProjectShape";
     return root;
@@ -376,6 +377,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
     *anno << "TechDraw_ShowAll";
     *anno << "TechDraw_WeldSymbol";
     *anno << "TechDraw_SurfaceFinishSymbols";
+    *anno << "TechDraw_HoleShaftFit";
     return root;
 }
 
@@ -525,6 +527,7 @@ Gui::ToolBarItem* Workbench::setupCommandBars() const
     *anno << "TechDraw_ShowAll";
     *anno << "TechDraw_WeldSymbol";
     *anno << "TechDraw_SurfaceFinishSymbols";
+    *anno << "TechDraw_HoleShaftFit";
 
     return root;
 }
diff --git a/src/Mod/TechDraw/TechDrawTools/__init__.py b/src/Mod/TechDraw/TechDrawTools/__init__.py
index 37cabe6849..dd21abe35b 100644
--- a/src/Mod/TechDraw/TechDrawTools/__init__.py
+++ b/src/Mod/TechDraw/TechDrawTools/__init__.py
@@ -34,5 +34,7 @@ from .TDToolsUtil import *
 from .CommandShareView import CommandShareView
 from .CommandMoveView import CommandMoveView
 from .CommandAxoLengthDimension import CommandAxoLengthDimension
+from .CommandHoleShaftFit import CommandHoleShaftFit
 from .TaskShareView import TaskShareView
 from .TaskMoveView import TaskMoveView
+from .TaskHoleShaftFit import TaskHoleShaftFit