diff --git a/TODO.txt b/TODO.txt
index e895a7b..1929036 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -46,7 +46,6 @@ materials.rock	No		Smooth limestone
 materials.rock	No		Smooth slate
 materials.rock	No		Basalt
 -------------------------------------------------------------------------------------------------------
-materials.ore	No		Rock salt
 materials.ore	No		Aluminium (bauxite)
 materials.ore	No		Silver (native, horn silver)
 materials.ore	No		Lead (galena)
diff --git a/graphics/ore.xcf b/graphics/ore.xcf
index e38298b..15221e1 100644
Binary files a/graphics/ore.xcf and b/graphics/ore.xcf differ
diff --git a/src/java/mmm/materials/Materials.java b/src/java/mmm/materials/Materials.java
index 7295776..50bb19d 100644
--- a/src/java/mmm/materials/Materials.java
+++ b/src/java/mmm/materials/Materials.java
@@ -5,6 +5,7 @@ import mmm.materials.ore.MOCassiterite;
 import mmm.materials.ore.MOCopper;
 import mmm.materials.ore.MOCuprite;
 import mmm.materials.ore.MOMalachite;
+import mmm.materials.ore.MORockSalt;
 import mmm.materials.ore.MOSphalerite;
 import mmm.materials.rock.MRChalk;
 import mmm.materials.rock.MRLimestone;
@@ -43,12 +44,14 @@ public class Materials
 	public static final Item ITEM_CUPRITE;
 	public static final Item ITEM_CASSITERITE;
 	public static final Item ITEM_SPHALERITE;
+	public static final Item ITEM_ROCK_SALT;
 
 	public static final MOre ORE_COPPER;
 	public static final MOre ORE_MALACHITE;
 	public static final MOre ORE_CUPRITE;
 	public static final MOre ORE_CASSITERITE;
 	public static final MOre ORE_SPHALERITE;
+	public static final MOre ORE_ROCK_SALT;
 
 	static {
 		// Rocks
@@ -83,6 +86,7 @@ public class Materials
 		ITEM_CUPRITE = Materials.makeItem( "cuprite" );
 		ITEM_CASSITERITE = Materials.makeItem( "cassiterite" );
 		ITEM_SPHALERITE = Materials.makeItem( "sphalerite" );
+		ITEM_ROCK_SALT = Materials.makeItem( "rock_salt" );
 
 		// Actual ores
 		ORE_COPPER = new MOCopper( );
@@ -90,6 +94,7 @@ public class Materials
 		ORE_CUPRITE = new MOCuprite( );
 		ORE_CASSITERITE = new MOCassiterite( );
 		ORE_SPHALERITE = new MOSphalerite( );
+		ORE_ROCK_SALT = new MORockSalt( );
 
 		// Other recipes
 		URegistry.addRecipeRegistrar( new Materials( ) );
diff --git a/src/java/mmm/materials/ore/MORockSalt.java b/src/java/mmm/materials/ore/MORockSalt.java
new file mode 100644
index 0000000..3a7c670
--- /dev/null
+++ b/src/java/mmm/materials/ore/MORockSalt.java
@@ -0,0 +1,35 @@
+package mmm.materials.ore;
+
+
+import java.util.List;
+
+import mmm.materials.MOre;
+import mmm.materials.Materials;
+import mmm.utils.I_UOreGenerationRegistrar;
+import mmm.world.WLocation;
+import mmm.world.gen.WGOreCondition;
+import mmm.world.gen.WGOreParameters;
+
+
+
+public class MORockSalt
+		extends MOre
+		implements I_UOreGenerationRegistrar
+{
+
+	public MORockSalt( )
+	{
+		super( "rock_salt" , 0 );
+		this.setDrops( Materials.ITEM_ROCK_SALT , 2 , 5 );
+		this.setExperience( 0 , 1 );
+	}
+
+
+	@Override
+	public void addConditions( final List< WGOreCondition > conditions )
+	{
+		conditions.add( new WGOreCondition( WLocation.inOverworld( ) ,
+				new WGOreParameters( this.getDefaultState( ) , 5 , 30 , 45 , 255 ) ) );
+	}
+
+}
diff --git a/src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json b/src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json
new file mode 100644
index 0000000..a5cbeb4
--- /dev/null
+++ b/src/resources/assets/mmm/blockstates/materials/ore/rock_salt.json
@@ -0,0 +1,5 @@
+{
+    "variants": {
+        "normal": { "model": "mmm:materials/ore/rock_salt" }
+    }
+}
diff --git a/src/resources/assets/mmm/lang/en_US.lang b/src/resources/assets/mmm/lang/en_US.lang
index 20694ca..1a88f4e 100644
--- a/src/resources/assets/mmm/lang/en_US.lang
+++ b/src/resources/assets/mmm/lang/en_US.lang
@@ -12,6 +12,9 @@ tile.mmm.materials.rock.limestone.name=Limestone
 tile.mmm.materials.rock.chalk.name=Chalk
 tile.mmm.materials.rock.slate.name=Slate
 
+tile.mmm.materials.ore.rock_salt.name=Rock Salt
+item.mmm.materials.stone.rock_salt.name=Salt Crystals
+
 item.mmm.materials.stone.coke.name=Coke
 item.mmm.materials.stone.slag.name=Slag
 item.mmm.materials.nugget.iron.name=Iron Nugget
diff --git a/src/resources/assets/mmm/models/block/materials/ore/rock_salt.json b/src/resources/assets/mmm/models/block/materials/ore/rock_salt.json
new file mode 100644
index 0000000..c2a4127
--- /dev/null
+++ b/src/resources/assets/mmm/models/block/materials/ore/rock_salt.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:block/cube_all",
+    "textures": {
+        "all": "mmm:blocks/materials/ore/rock_salt"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/ore/rock_salt.json b/src/resources/assets/mmm/models/item/materials/ore/rock_salt.json
new file mode 100644
index 0000000..2d680d5
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/ore/rock_salt.json
@@ -0,0 +1,3 @@
+{
+    "parent": "mmm:block/materials/ore/rock_salt"
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/models/item/materials/stone/rock_salt.json b/src/resources/assets/mmm/models/item/materials/stone/rock_salt.json
new file mode 100644
index 0000000..940b2ff
--- /dev/null
+++ b/src/resources/assets/mmm/models/item/materials/stone/rock_salt.json
@@ -0,0 +1,6 @@
+{
+    "parent": "minecraft:item/generated",
+    "textures": {
+        "layer0": "mmm:items/materials/stone/rock_salt"
+    }
+}
\ No newline at end of file
diff --git a/src/resources/assets/mmm/textures/blocks/materials/ore/rock_salt.png b/src/resources/assets/mmm/textures/blocks/materials/ore/rock_salt.png
new file mode 100644
index 0000000..23d10df
Binary files /dev/null and b/src/resources/assets/mmm/textures/blocks/materials/ore/rock_salt.png differ
diff --git a/src/resources/assets/mmm/textures/items/materials/stone/rock_salt.png b/src/resources/assets/mmm/textures/items/materials/stone/rock_salt.png
new file mode 100644
index 0000000..8980e5d
Binary files /dev/null and b/src/resources/assets/mmm/textures/items/materials/stone/rock_salt.png differ