diff --git a/mods/ITEMS/mclx_core/depends.txt b/mods/ITEMS/mclx_core/depends.txt
new file mode 100644
index 0000000000..870d9cb09c
--- /dev/null
+++ b/mods/ITEMS/mclx_core/depends.txt
@@ -0,0 +1,2 @@
+mcl_core
+doc?
diff --git a/mods/ITEMS/mclx_core/description.txt b/mods/ITEMS/mclx_core/description.txt
new file mode 100644
index 0000000000..422e6da57c
--- /dev/null
+++ b/mods/ITEMS/mclx_core/description.txt
@@ -0,0 +1 @@
+Core items not found in Minecraft
diff --git a/mods/ITEMS/mclx_core/init.lua b/mods/ITEMS/mclx_core/init.lua
new file mode 100644
index 0000000000..f16d57ba04
--- /dev/null
+++ b/mods/ITEMS/mclx_core/init.lua
@@ -0,0 +1,50 @@
+-- Liquids: River Water
+
+local source = table.copy(minetest.registered_nodes["mcl_core:water_source"])
+source.description = "Still River Water"
+source.liquid_range = 2
+source.liquid_alternative_flowing = "mclx_core:river_water_flowing"
+source.liquid_alternative_source = "mclx_core:river_water_source"
+source._doc_items_longdesc = "River water has the same properties as water, but has a reduced flowing distance and is not renewable."
+source._doc_items_entry_name = "River Water"
+-- Auto-expose entry only in valleys mapgen
+source._doc_items_hidden = minetest.get_mapgen_setting("mg_name") ~= "valleys"
+source.post_effect_color = {a=204, r=0x2c, g=0x88, b=0x8c}
+source.tiles = {
+	{name="default_river_water_source_animated.png", animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0}}
+}
+source.special_tiles = {
+	-- New-style water source material (mostly unused)
+	{
+		name="default_river_water_source_animated.png",
+		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=5.0},
+		backface_culling = false,
+	}
+}
+
+local flowing = table.copy(minetest.registered_nodes["mcl_core:water_flowing"])
+flowing.description = "Flowing River Water"
+flowing.liquid_range = 2
+flowing.liquid_alternative_flowing = "mclx_core:river_water_flowing"
+flowing.liquid_alternative_source = "mclx_core:river_water_source"
+flowing.tiles = {"default_river_water_flowing_animated.png^[verticalframe:64:0"}
+flowing.post_effect_color = {a=204, r=0x2c, g=0x88, b=0x8c}
+flowing.special_tiles = {
+	{
+		image="default_river_water_flowing_animated.png",
+		backface_culling=false,
+		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0}
+	},
+	{
+		image="default_river_water_flowing_animated.png",
+		backface_culling=true,
+		animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=4.0}
+	},
+}
+
+minetest.register_node("mclx_core:river_water_source", source)
+minetest.register_node("mclx_core:river_water_flowing", flowing)
+
+if minetest.get_modpath("doc") then
+	doc.add_entry_alias("nodes", "mclx_core:river_water_source", "nodes", "mclx_core:river_water_flowing")
+end
diff --git a/mods/ITEMS/mclx_core/mod.conf b/mods/ITEMS/mclx_core/mod.conf
new file mode 100644
index 0000000000..235cf6d3f4
--- /dev/null
+++ b/mods/ITEMS/mclx_core/mod.conf
@@ -0,0 +1 @@
+name = mclx_core
diff --git a/mods/ITEMS/mclx_core/textures/default_river_water_flowing_animated.png b/mods/ITEMS/mclx_core/textures/default_river_water_flowing_animated.png
new file mode 100644
index 0000000000..9e126d3c1f
Binary files /dev/null and b/mods/ITEMS/mclx_core/textures/default_river_water_flowing_animated.png differ
diff --git a/mods/ITEMS/mclx_core/textures/default_river_water_source_animated.png b/mods/ITEMS/mclx_core/textures/default_river_water_source_animated.png
new file mode 100644
index 0000000000..fb8ae17bd7
Binary files /dev/null and b/mods/ITEMS/mclx_core/textures/default_river_water_source_animated.png differ
diff --git a/mods/MAPGEN/mcl_mapgen_core/depends.txt b/mods/MAPGEN/mcl_mapgen_core/depends.txt
index 56161d59bc..9dc58fe695 100644
--- a/mods/MAPGEN/mcl_mapgen_core/depends.txt
+++ b/mods/MAPGEN/mcl_mapgen_core/depends.txt
@@ -1,5 +1,6 @@
 mcl_init
 mcl_core
+mclx_core?
 mcl_worlds
 mcl_cocoas
 mcl_stairs
diff --git a/mods/MAPGEN/mcl_mapgen_core/init.lua b/mods/MAPGEN/mcl_mapgen_core/init.lua
index d88e91d3b7..c76cfc6c8b 100644
--- a/mods/MAPGEN/mcl_mapgen_core/init.lua
+++ b/mods/MAPGEN/mcl_mapgen_core/init.lua
@@ -28,7 +28,11 @@ minetest.register_alias("mapgen_stone_with_iron", "mcl_core:stone_with_iron")
 minetest.register_alias("mapgen_desert_sand", "mcl_core:sand")
 minetest.register_alias("mapgen_desert_stone", "mcl_core:sandstone")
 minetest.register_alias("mapgen_sandstone", "mcl_core:sandstone")
-minetest.register_alias("mapgen_river_water_source", "mcl_core:water_source")
+if minetest.get_modpath("mclx_core") then
+	minetest.register_alias("mapgen_river_water_source", "mclx_core:river_water_source")
+else
+	minetest.register_alias("mapgen_river_water_source", "mcl_core:water_source")
+end
 minetest.register_alias("mapgen_snow", "mcl_core:snow")
 minetest.register_alias("mapgen_snowblock", "mcl_core:snowblock")
 minetest.register_alias("mapgen_ice", "mcl_core:ice")