diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index bee062feba7..817b876b1c8 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -182,6 +182,7 @@
 	icon = 'icons/obj/module.dmi'
 	icon_state = "mainboard"
 	w_class = 2
+	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
 
 /obj/structure/firelock_frame
 	name = "firelock frame"
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index f8a3630e062..37cd8f0c0ec 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -107,7 +107,7 @@
 	category = list("initial", "Electronics")
 
 /datum/design/apc_board
-	name = "APC Power Control Module"
+	name = "APC m odule"
 	id = "power control"
 	build_type = AUTOLATHE
 	materials = list(MAT_METAL = 100, MAT_GLASS = 100)
@@ -122,6 +122,14 @@
 	build_path = /obj/item/weapon/airlock_electronics
 	category = list("initial", "Electronics")
 
+/datum/design/firelock_board
+	name = "Firelock circuitry"
+	id = "firelock_board"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 50, MAT_GLASS = 50)
+	build_path = /obj/item/weapon/firelock_board
+	category = list("initial", "Electronics")
+
 /datum/design/airalarm_electronics
 	name = "Air alarm electronics"
 	id = "airalarm_electronics"
diff --git a/html/changelogs/Xhuis-Firelocks.yml b/html/changelogs/Xhuis-Firelocks.yml
new file mode 100644
index 00000000000..12116c1ed1c
--- /dev/null
+++ b/html/changelogs/Xhuis-Firelocks.yml
@@ -0,0 +1,6 @@
+author: Dorsidwarf
+delete-after: True
+
+changes: 
+  - rscadd: "Firelocks may now be constructed and deconstructed with standard tools. Circuit boards can be produced at a standard autolathe."
+