diff --git a/formulae b/formulae
index 80280cea2..83ecf88a5 100644
--- a/formulae
+++ b/formulae
@@ -269,6 +269,17 @@ skill alchemy
 cauldron cauldron
 ingred 3 pearl,water of the wise
 #
+# black powder
+Object NONE
+arch blackpowder
+chance 40
+diff 1
+yield 8
+exp 100
+skill alchemy
+cauldron cauldron
+ingred 1 charcoal,1 pile of sulphur,6 pile of saltpeter
+#
 # Now for basic smithery ingredients -- the bars (made from ores)
 #
 #
@@ -520,6 +531,28 @@ skill smithery
 cauldron forge
 ingred 4 iron bar,brass bar
 #
+# bomb shell
+Object NONE
+arch bomb_shell
+chance 3
+diff 5
+exp 500
+yield 1
+skill smithery
+cauldron forge
+ingred iron bar
+#
+# bomb
+Object NONE
+arch bomb_unlit
+chance 3
+diff 10
+exp 2000
+yield 1
+skill smithery
+cauldron forge
+ingred bomb shell,3 pile of black powder
+#
 # ----------------
 # Silvered weapons
 # ----------------
diff --git a/inorganic/ashes.arc b/inorganic/ashes.arc
index 7429af510..b7b8d6456 100644
--- a/inorganic/ashes.arc
+++ b/inorganic/ashes.arc
@@ -6,3 +6,12 @@ client_type 642
 type 73
 identified 1
 end
+
+Object charcoal
+name charcoal
+face charcoal.111
+nrof 1
+weight 100
+client_type 642
+type 73
+end
diff --git a/inorganic/charcoal.base.111.png b/inorganic/charcoal.base.111.png
new file mode 100644
index 000000000..36a5b087c
Binary files /dev/null and b/inorganic/charcoal.base.111.png differ
diff --git a/inorganic/charcoal.base.111.png.LICENSE b/inorganic/charcoal.base.111.png.LICENSE
new file mode 100644
index 000000000..c99a67bc4
--- /dev/null
+++ b/inorganic/charcoal.base.111.png.LICENSE
@@ -0,0 +1,4 @@
+comment Original artwork by Saiapatsu/twiswist, created for Crossfire
+license cc0
+licenseurl https://creativecommons.org/publicdomain/zero/1.0/
+sourcename Saiapatsu
diff --git a/inorganic/charcoal.face b/inorganic/charcoal.face
new file mode 100644
index 000000000..e79394ba5
--- /dev/null
+++ b/inorganic/charcoal.face
@@ -0,0 +1,3 @@
+face charcoal.111
+magicmap black
+end
diff --git a/inorganic/minerals.arc b/inorganic/minerals.arc
index 641e6b107..1d3115f62 100644
--- a/inorganic/minerals.arc
+++ b/inorganic/minerals.arc
@@ -26,6 +26,20 @@ name_pl piles
 client_type 641
 end
 
+Object saltpeter
+name pile
+name_pl piles
+title of saltpeter
+face salt.111
+nrof 1
+material 64
+materialname saltpeter
+type 73
+value 10
+weight 500
+client_type 641
+end
+
 Object sulphur
 name pile
 title of sulphur
@@ -42,6 +56,21 @@ name_pl piles
 client_type 641
 end
 
+Object blackpowder
+name pile
+name_pl piles
+title of black powder
+face graphite.111
+nrof 1
+material 64
+materialname blackpowder
+type 73
+value 15
+resist_fire -100
+weight 500
+client_type 641
+end
+
 Object graphite
 name pile
 title of graphite
diff --git a/spell/Bomb/bomb.arc b/spell/Bomb/bomb.arc
index 866fbca89..d341c92e3 100644
--- a/spell/Bomb/bomb.arc
+++ b/spell/Bomb/bomb.arc
@@ -1,9 +1,36 @@
+Object bomb_shell
+name bomb shell
+name_pl bomb shells
+type 79
+client_type 645
+material 2
+face bomb_shell.111
+weight 3000
+end
+
+Object bomb_unlit
+name bomb
+name_pl bombs
+type 163
+client_type 170
+material 2
+is_lightable 1
+other_arch bomb
+face bomb_unlit.111
+weight 4000
+end
+
 Object bomb
 type 102
+client_type 170
 subtype 8
 other_arch explosion
 face bomb.111
 animation bomb
 speed 0.2
 weight 4000
+range 3
+dam 100
+duration 3
+attacktype 1
 end
diff --git a/spell/Bomb/bomb.face b/spell/Bomb/bomb.face
index 3b59c81c2..0be1200ae 100644
--- a/spell/Bomb/bomb.face
+++ b/spell/Bomb/bomb.face
@@ -1,3 +1,9 @@
+face bomb_shell.111
+magicmap black
+end
+face bomb_unlit.111
+magicmap black
+end
 animation bomb
 bomb.111
 bomb.111
diff --git a/spell/Bomb/bomb_shell.base.111.png b/spell/Bomb/bomb_shell.base.111.png
new file mode 100644
index 000000000..62fbc7dbd
Binary files /dev/null and b/spell/Bomb/bomb_shell.base.111.png differ
diff --git a/spell/Bomb/bomb_unlit.base.111.png b/spell/Bomb/bomb_unlit.base.111.png
new file mode 100644
index 000000000..356ba7739
Binary files /dev/null and b/spell/Bomb/bomb_unlit.base.111.png differ