diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 58d7bc80aa7..842ece48421 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -293,7 +293,7 @@
 		new /datum/data/mining_equipment("Resonator",           /obj/item/weapon/resonator,                                    	   800),
 		new /datum/data/mining_equipment("Lazarus Injector",    /obj/item/weapon/lazarus_injector,                                1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",		/obj/item/weapon/pickaxe/silver,				                  1000),
-		new /datum/data/mining_equipment("Jetpack",             /obj/item/weapon/tank/jetpack/carbondioxide/mining,               2000),
+		new /datum/data/mining_equipment("Jetpack Upgrade",		/obj/item/hardsuit_jetpack						,	              2000),
 		new /datum/data/mining_equipment("Space Cash",    		/obj/item/stack/spacecash/c1000,                    			  2000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",		/obj/item/weapon/pickaxe/diamond,				                  2000),
 		new /datum/data/mining_equipment("Super Resonator",     /obj/item/weapon/resonator/upgraded,                              2500),
@@ -885,15 +885,25 @@
 	icon = 'icons/obj/mining.dmi'
 	icon_state = "xeno_warning"
 
-/**********************Mining Jetpack**********************/
-/obj/item/weapon/tank/jetpack/carbondioxide/mining
-	name = "mining jetpack"
-	icon_state = "jetpack-mining"
-	item_state = "jetpack-mining"
-	desc = "A tank of compressed carbon dioxide for miners to use as propulsion in local space. The compact size allows for easy storage at the cost of capacity."
-	volume = 40
-	throw_range = 7
-	w_class = 3 //same as syndie harness
+/******************Hardsuit Jetpack Upgrade*******************/
+/obj/item/hardsuit_jetpack
+	name = "hardsuit jetpack upgrade"
+	icon_state = "jetpack_upgrade"
+	desc = "A modular, compact set of thrusters designed to intigrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment."
+
+
+/obj/item/hardsuit_jetpack/afterattack(var/obj/item/clothing/suit/space/hardsuit/S, mob/user)
+	..()
+	if(!istype(S))
+		user << "<span class='warning'>This upgrade can only be applied to a hardsuit.</span>"
+	else if(S.jetpack)
+		user << "<span class='warning'>[S] already has a jetpack installed.</span>"
+	else if(S == user.get_item_by_slot(slot_wear_suit)) //Make sure the player is not wearing the suit before applying the upgrade.
+		user << "<span class='warning'>You cannot install the upgrade while wearing [S].</span>"
+	else
+		S.jetpack = new /obj/item/weapon/tank/jetpack/suit(S)
+		user << "<span class='notice'>You successfully install the jetpack into [S].</span>"
+		qdel(src)
 
 /*********************Hivelord stabilizer****************/
 
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 25da8bb0887..e07f665dcb8 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ