diff --git a/README.md b/README.md
index 0f4d3244..a08d355d 100644
--- a/README.md
+++ b/README.md
@@ -106,7 +106,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 	* [coloredwood][] ([LGPL][lic.lgpl3.0]) -- version: [fc4ab15 Git][ver.coloredwood] *2017-03-18* ([patched][patch.coloredwood])
 	* [mywoodslopes][] ([DWYWPL][lic.dwywpl]) -- version: [3a1b531 Git][ver.mywoodslopes] *2016-03-23*
 * world/
-    * [bedrock2][] ([WTFPL][lic.wtfpl]) -- version [1.2.0-0378b61 Git][ver.bedrock2]
+    * [bedrock2][] ([WTFPL][lic.wtfpl]) -- version [1.2.2 (5fe9e87 Git)][ver.bedrock2] *2016-11-21* ([patched][patch.bedrock2])
     * [biome_lib][] ([WTFPL][lic.wtfpl]) -- version: [9cdcdcf Git][ver.biome_lib] *2017-01-26*
     * [ethereal][] ([MIT][lic.ethereal]) -- version [2c24961 Git][ver.ethereal] *2017-04-23* ([patched][patch.ethereal])
     * [glow][] ([GPL][lic.gpl2.0]) -- version: [30f9cf3 Git][ver.glow] *2015-09-25*
@@ -402,7 +402,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [ver.awards]: https://github.com/minetest-mods/awards/tree/096fe16
 [ver.away]: https://github.com/kahrl/minetest-mod-away/tree/4c1e5a9
 [ver.bags]: https://github.com/cornernote/minetest-bags/tree/f17d829
-[ver.bedrock2]: http://repo.or.cz/minetest_bedrock2.git/tree/0378b61
+[ver.bedrock2]: http://repo.or.cz/minetest_bedrock2.git/tree/5fe9e87
 [ver.biome_lib]: https://github.com/minetest-mods/biome_lib/tree/9cdcdcf
 [ver.bookmarks_gui]: https://github.com/cornernote/minetest-bookmarks_gui/tree/d369dba
 [ver.bridges]: https://github.com/Sokomine/bridges/tree/5b5f475
@@ -476,6 +476,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m
 [patch.adv_spawning]: https://github.com/AntumDeluge/mtmod-adv_spawning/tree/572688b
 [patch.animals_modpack]: https://github.com/AntumDeluge/mtmp-animals_modpack/tree/e84e1e6
 [patch.bags]: https://github.com/AntumDeluge/mtmod-bags/tree/4363284
+[patch.bedrock2]: https://github.com/AntumDeluge/mtmod-bedrock2/tree/0375ac1
 [patch.campfire]: https://github.com/AntumDeluge/mtmod-campfire/tree/67b9dd7
 [patch.christmas]: https://github.com/AntumDeluge/mtmod-christmas/tree/f6c8dc2
 [patch.coloredwood]: https://github.com/AntumDeluge/mtmod-coloredwood/tree/ed6c46f
diff --git a/mods/world/bedrock2/README.txt b/mods/world/bedrock2/README.md
similarity index 77%
rename from mods/world/bedrock2/README.txt
rename to mods/world/bedrock2/README.md
index be4fef96..5309a589 100644
--- a/mods/world/bedrock2/README.txt
+++ b/mods/world/bedrock2/README.md
@@ -1,10 +1,11 @@
-Bedrock mod.
+# Bedrock [`bedrock2`]
 
-Version 1.2.0
+Version 1.2.2
 
+## Description
 This mod adds an indestructible bedrock layer at the bottom of the world.
 
-
+## Configuration
 This mod recognizes the following minetest.conf setting:
 
 * `bedrock2_y`: Sets the Y coordinate on which the bedrock layer will be created (default: -30912).
diff --git a/mods/world/bedrock2/depends.txt b/mods/world/bedrock2/depends.txt
index eee2853b..22c1fff5 100644
--- a/mods/world/bedrock2/depends.txt
+++ b/mods/world/bedrock2/depends.txt
@@ -1,3 +1,2 @@
 intllib?
 mesecons_mvps?
-doc_items?
diff --git a/mods/world/bedrock2/init.lua b/mods/world/bedrock2/init.lua
index 194a0276..47139a75 100644
--- a/mods/world/bedrock2/init.lua
+++ b/mods/world/bedrock2/init.lua
@@ -1,9 +1,9 @@
+-- Boilerplate to support localized strings if intllib mod is installed.
 local S
-if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+if minetest.get_modpath("intllib") then
+	S = intllib.Getter()
 else
-	S = function ( s ) return s end
+	S = function(s) return s end
 end
 
 local bedrock = {}
@@ -11,11 +11,14 @@ local bedrock = {}
 bedrock.layer = -30912 -- determined as appropriate by experiment
 bedrock.node = {name = "bedrock2:bedrock"}
 
-local depth = tonumber(minetest.setting_get("bedrock2_y"))
+local depth = tonumber(minetest.settings:get("bedrock2_y"))
 if depth ~= nil then
 	bedrock.layer = depth
 end
 
+-- DEBUG:
+minetest.log("action", "[" .. minetest.get_current_modname() .. "] Bedrock depth: " .. tostring(depth))
+
 minetest.register_on_generated(function(minp, maxp)
 	if maxp.y >= bedrock.layer and minp.y <= bedrock.layer then
 		local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
@@ -39,8 +42,9 @@ end)
 
 minetest.register_node("bedrock2:bedrock", {
 	description = S("Bedrock"),
+	_doc_items_longdesc = S("Bedrock is a very hard block. It cannot be mined, altered, destroyed or moved by any means. It appears at the bottom of the world in a flat layer."),
 	tiles = {"bedrock2_bedrock.png"},
-	groups = {immortal=1, not_in_creative_inventory=1, in_doc = 1 },
+	groups = {immortal=1, not_in_creative_inventory=1, },
 	sounds = { footstep = { name = "bedrock2_step", gain = 1 } },
 	is_ground_content = false,
 	on_blast = function() end,
@@ -51,9 +55,5 @@ minetest.register_node("bedrock2:bedrock", {
 })
 
 if minetest.get_modpath("mesecons_mvps") ~= nil then
-	mesecon:register_mvps_stopper("bedrock2:bedrock")
-end
-
-if minetest.get_modpath("doc_items") ~= nil then
-	doc.sub.items.set_items_longdesc({["bedrock2:bedrock"] = S("Bedrock is a very hard block. It cannot be mined, altered, destroyed or moved by any means. It appears at the bottom of the world in a flat layer.")})
+	mesecon.register_mvps_stopper("bedrock2:bedrock")
 end
diff --git a/mods/world/bedrock2/locale/de.txt b/mods/world/bedrock2/locale/de.txt
deleted file mode 100644
index 5e082dc1..00000000
--- a/mods/world/bedrock2/locale/de.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Bedrock = Grundgestein
-Bedrock is a very hard block. It cannot be mined, altered, destroyed or moved by any means. It appears at the bottom of the world in a flat layer. = Grundgestein ist sehr hart. Es kann nicht gegraben, verändert, zerstört oder bewegt werden. Es taucht am Boden der Welt in einer flachen Ebene auf.
diff --git a/mods/world/bedrock2/locale/template.txt b/mods/world/bedrock2/locale/template.txt
deleted file mode 100644
index 555f8045..00000000
--- a/mods/world/bedrock2/locale/template.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Bedrock
-Bedrock is a very hard block. It cannot be mined, altered, destroyed or moved by any means. It appears at the bottom of the world in a flat layer.