diff --git a/README.md b/README.md
index e96232db..057dfa2b 100644
--- a/README.md
+++ b/README.md
@@ -4801,6 +4801,11 @@ They include support for:
   - _PCB2Blender_tools_2_1: Pads and bounds information. Disabled by default.
   - _PCB2Blender_2_1: The PCB3D file. Is enabled and creates the other files.
   - _PCB2Blender_elements_2_1: _PCB2Blender_tools_2_1+_PCB2Blender_layers_2_1+_PCB2Blender_vrml_2_1
+- [PCB2Blender_2_1_haschtl](https://github.com/haschtl/pcb2blender)
+  - Imports `PCB2Blender_2_1` and disables `_PCB2Blender_2_1`
+  - _PCB2Blender_tools_2_1_haschtl: Pads, bounds and stack-up information. Disabled by default.
+  - _PCB2Blender_2_1_haschtl: The PCB3D file. Is enabled and creates the other files.
+  - _PCB2Blender_elements_2_1_haschtl: _PCB2Blender_tools_2_1_haschtl+_PCB2Blender_layers_2_1+_PCB2Blender_vrml_2_1
 - [PCBWay](https://www.pcbway.com): contain fabrication outputs compatible with PCBWay
   - _PCBWay_gerbers: Gerbers
   - _PCBWay_drill: Drill files
diff --git a/docs/README.in b/docs/README.in
index afb3fab6..e662fe15 100644
--- a/docs/README.in
+++ b/docs/README.in
@@ -1317,6 +1317,11 @@ They include support for:
   - _PCB2Blender_tools_2_1: Pads and bounds information. Disabled by default.
   - _PCB2Blender_2_1: The PCB3D file. Is enabled and creates the other files.
   - _PCB2Blender_elements_2_1: _PCB2Blender_tools_2_1+_PCB2Blender_layers_2_1+_PCB2Blender_vrml_2_1
+- [PCB2Blender_2_1_haschtl](https://github.com/haschtl/pcb2blender)
+  - Imports `PCB2Blender_2_1` and disables `_PCB2Blender_2_1`
+  - _PCB2Blender_tools_2_1_haschtl: Pads, bounds and stack-up information. Disabled by default.
+  - _PCB2Blender_2_1_haschtl: The PCB3D file. Is enabled and creates the other files.
+  - _PCB2Blender_elements_2_1_haschtl: _PCB2Blender_tools_2_1_haschtl+_PCB2Blender_layers_2_1+_PCB2Blender_vrml_2_1
 - [PCBWay](https://www.pcbway.com): contain fabrication outputs compatible with PCBWay
   - _PCBWay_gerbers: Gerbers
   - _PCBWay_drill: Drill files
diff --git a/kibot/resources/config_templates/PCB2Blender_2_1_haschtl.kibot.yaml b/kibot/resources/config_templates/PCB2Blender_2_1_haschtl.kibot.yaml
new file mode 100644
index 00000000..2a3214cb
--- /dev/null
+++ b/kibot/resources/config_templates/PCB2Blender_2_1_haschtl.kibot.yaml
@@ -0,0 +1,39 @@
+# PCB2Blender (PCB3D) format for plug-in v2.1
+# This is the variant used in the Haschtl fork
+# URL: https://github.com/haschtl/pcb2blender
+kibot:
+  version: 1
+
+import:
+  - file: PCB2Blender_2_1
+
+groups:
+  - name: _PCB2Blender_elements_2_1_haschtl
+    outputs:
+      - _PCB2Blender_tools_2_1_haschtl
+      - _PCB2Blender_layers_2_1
+      - _PCB2Blender_vrml_2_1
+
+outputs:
+  - name: _PCB2Blender_tools_2_1_haschtl
+    comment: Pads information and board bounds for PCB3D 2.1 (Haschtl fork)
+    type: pcb2blender_tools
+    dir: '%f%v_pcb3d'
+    run_by_default: false
+    options:
+      stackup_create: true
+
+  - name: _PCB2Blender_2_1_haschtl
+    comment: PCB3D model for pcb2blender plug-in (Haschtl fork)
+    type: compress
+    disable_run_by_default: _PCB2Blender_2_1
+    options:
+      output: '%f%v.pcb3d'
+      format: ZIP
+      files:
+        - from_output: _PCB2Blender_tools_2_1_haschtl
+          from_output_dir: true
+        - from_output: _PCB2Blender_layers_2_1
+          dest: layers
+        - from_output: _PCB2Blender_vrml_2_1
+          from_output_dir: true
diff --git a/tests/yaml_samples/pcb2blender_tools_3.kibot.yaml b/tests/yaml_samples/pcb2blender_tools_3.kibot.yaml
new file mode 100644
index 00000000..ceb85cb9
--- /dev/null
+++ b/tests/yaml_samples/pcb2blender_tools_3.kibot.yaml
@@ -0,0 +1,7 @@
+# Test for the PCB3D file generation
+# Haschtl fork flavor
+kibot:
+  version: 1
+
+import:
+  - file: PCB2Blender_2_1_haschtl