diff --git a/mods/areas/hud.lua b/mods/areas/hud.lua
index 503da53..8a7d9dd 100644
--- a/mods/areas/hud.lua
+++ b/mods/areas/hud.lua
@@ -1,8 +1,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/arrow_signs/init.lua b/mods/arrow_signs/init.lua
index eae17ba..9b954bb 100644
--- a/mods/arrow_signs/init.lua
+++ b/mods/arrow_signs/init.lua
@@ -5,8 +5,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/castle/shields_decor.lua b/mods/castle/shields_decor.lua
index f2f2a71..5581d46 100644
--- a/mods/castle/shields_decor.lua
+++ b/mods/castle/shields_decor.lua
@@ -1,8 +1,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/castle/town_item.lua b/mods/castle/town_item.lua
index fee13b4..6d1174f 100644
--- a/mods/castle/town_item.lua
+++ b/mods/castle/town_item.lua
@@ -1,8 +1,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/cottages/nodes_furniture.lua b/mods/cottages/nodes_furniture.lua
index bc28641..fa276cb 100644
--- a/mods/cottages/nodes_furniture.lua
+++ b/mods/cottages/nodes_furniture.lua
@@ -15,8 +15,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/cottages/nodes_historic.lua b/mods/cottages/nodes_historic.lua
index 3bc4161..917fc41 100644
--- a/mods/cottages/nodes_historic.lua
+++ b/mods/cottages/nodes_historic.lua
@@ -11,8 +11,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/cottages/nodes_roof.lua b/mods/cottages/nodes_roof.lua
index 4da00aa..b23b7f3 100644
--- a/mods/cottages/nodes_roof.lua
+++ b/mods/cottages/nodes_roof.lua
@@ -6,8 +6,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/cottages/nodes_straw.lua b/mods/cottages/nodes_straw.lua
index 3b045b6..dd18690 100644
--- a/mods/cottages/nodes_straw.lua
+++ b/mods/cottages/nodes_straw.lua
@@ -7,8 +7,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/creative/init.lua b/mods/creative/init.lua
index a72cc36..8de7228 100644
--- a/mods/creative/init.lua
+++ b/mods/creative/init.lua
@@ -1,10 +1,9 @@
 -- minetest/creative/init.lua
 
 -- intllib support
-local S
+local S, F
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 	F = function( s )
 		return minetest.formspec_escape(S(s))
 	end
diff --git a/mods/darkage/nodes.lua b/mods/darkage/nodes.lua
index 5792883..b9c306f 100644
--- a/mods/darkage/nodes.lua
+++ b/mods/darkage/nodes.lua
@@ -1,8 +1,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/default/craftitems.lua b/mods/default/craftitems.lua
index 0391058..4b231b3 100644
--- a/mods/default/craftitems.lua
+++ b/mods/default/craftitems.lua
@@ -3,8 +3,7 @@
 -- intllib support
 local S, F
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 	F = function( s )
 		return minetest.formspec_escape(S(s))
 	end
diff --git a/mods/default/init.lua b/mods/default/init.lua
index 947f192..7ab00ce 100644
--- a/mods/default/init.lua
+++ b/mods/default/init.lua
@@ -6,8 +6,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/default/nodes.lua b/mods/default/nodes.lua
index 91ede3e..0cfd84a 100644
--- a/mods/default/nodes.lua
+++ b/mods/default/nodes.lua
@@ -3,8 +3,7 @@
 -- intllib support
 local S, F
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 	F = function( s )
 		return minetest.formspec_escape(S(s))
 	end
diff --git a/mods/default/tools.lua b/mods/default/tools.lua
index 0c997e6..39f225b 100644
--- a/mods/default/tools.lua
+++ b/mods/default/tools.lua
@@ -3,8 +3,7 @@
 -- intllib support
 local S, F
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/supplemental/init.lua b/mods/supplemental/init.lua
index dfab970..11601e3 100644
--- a/mods/supplemental/init.lua
+++ b/mods/supplemental/init.lua
@@ -1,8 +1,7 @@
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end
diff --git a/mods/tutorial/init.lua b/mods/tutorial/init.lua
index 2428fc8..5d6f063 100644
--- a/mods/tutorial/init.lua
+++ b/mods/tutorial/init.lua
@@ -3,8 +3,7 @@ tutorial = {}
 -- intllib support
 local S
 if (minetest.get_modpath("intllib")) then
-	dofile(minetest.get_modpath("intllib").."/intllib.lua")
-	S = intllib.Getter(minetest.get_current_modname())
+	S = intllib.Getter()
 else
   S = function ( s ) return s end
 end