diff --git a/mods/core/init.lua b/mods/core/init.lua
index 39dfb68..5754257 100644
--- a/mods/core/init.lua
+++ b/mods/core/init.lua
@@ -12,7 +12,6 @@ dofile(minetest.get_modpath("core").."/drop.lua")
 dofile(minetest.get_modpath("core").."/place.lua")
 dofile(minetest.get_modpath("core").."/falling.lua")
 dofile(minetest.get_modpath("core").."/seasons.lua")
-dofile(minetest.get_modpath("core").."/creative.lua")
 dofile(minetest.get_modpath("core").."/player.lua")
 dofile(minetest.get_modpath("core").."/stairs_and_slabs.lua")
-dofile(minetest.get_modpath("core").."/legacy.lua")
\ No newline at end of file
+dofile(minetest.get_modpath("core").."/legacy.lua")
diff --git a/mods/creative/README.txt b/mods/creative/README.txt
new file mode 100644
index 0000000..7d49b98
--- /dev/null
+++ b/mods/creative/README.txt
@@ -0,0 +1,22 @@
+Minetest 0.4 mod: creative
+==========================
+
+Implements creative mode.
+
+Switch on by using the "creative_mode" setting.
+
+Registered items that
+- have a description, and
+- do not have the group not_in_creative_inventory
+are added to the creative inventory.
+
+License of source code and media files:
+---------------------------------------
+Copyright (C) 2012 Perttu Ahola (celeron55) <celeron55@gmail.com>
+
+This program is free software. It comes without any warranty, to
+the extent permitted by applicable law. You can redistribute it
+and/or modify it under the terms of the Do What The Fuck You Want
+To Public License, Version 2, as published by Sam Hocevar. See
+http://sam.zoy.org/wtfpl/COPYING for more details.
+
diff --git a/mods/creative/depends.txt b/mods/creative/depends.txt
new file mode 100644
index 0000000..4ad96d5
--- /dev/null
+++ b/mods/creative/depends.txt
@@ -0,0 +1 @@
+default
diff --git a/mods/creative/init.lua b/mods/creative/init.lua
new file mode 100644
index 0000000..8a5f72e
--- /dev/null
+++ b/mods/creative/init.lua
@@ -0,0 +1,163 @@
+-- minetest/creative/init.lua
+
+creative_inventory = {}
+creative_inventory.creative_inventory_size = 0
+
+-- Create detached creative inventory after loading all mods
+minetest.after(0, function()
+	local inv = minetest.create_detached_inventory("creative", {
+		allow_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+			if minetest.setting_getbool("creative_mode") then
+				return count
+			else
+				return 0
+			end
+		end,
+		allow_put = function(inv, listname, index, stack, player)
+			return 0
+		end,
+		allow_take = function(inv, listname, index, stack, player)
+			if minetest.setting_getbool("creative_mode") then
+				return -1
+			else
+				return 0
+			end
+		end,
+		on_move = function(inv, from_list, from_index, to_list, to_index, count, player)
+		end,
+		on_put = function(inv, listname, index, stack, player)
+		end,
+		on_take = function(inv, listname, index, stack, player)
+			print(player:get_player_name().." takes item from creative inventory; listname="..dump(listname)..", index="..dump(index)..", stack="..dump(stack))
+			if stack then
+				print("stack:get_name()="..dump(stack:get_name())..", stack:get_count()="..dump(stack:get_count()))
+			end
+		end,
+	})
+	local creative_list = {}
+	for name,def in pairs(minetest.registered_items) do
+		if (not def.groups.not_in_creative_inventory or def.groups.not_in_creative_inventory == 0)
+				and def.description and def.description ~= "" then
+			table.insert(creative_list, name)
+		end
+	end
+	table.sort(creative_list)
+	inv:set_size("main", #creative_list)
+	for _,itemstring in ipairs(creative_list) do
+		inv:add_item("main", ItemStack(itemstring))
+	end
+	creative_inventory.creative_inventory_size = #creative_list
+	print("creative inventory size: "..dump(creative_inventory.creative_inventory_size))
+end)
+
+-- Create the trash field
+local trash = minetest.create_detached_inventory("creative_trash", {
+	-- Allow the stack to be placed and remove it in on_put()
+	-- This allows the creative inventory to restore the stack
+	allow_put = function(inv, listname, index, stack, player)
+		if minetest.setting_getbool("creative_mode") then
+			return stack:get_count()
+		else
+			return 0
+		end
+	end,
+	on_put = function(inv, listname, index, stack, player)
+		inv:set_stack(listname, index, "")
+	end,
+})
+trash:set_size("main", 1)
+
+
+creative_inventory.set_creative_formspec = function(player, start_i, pagenum)
+	pagenum = math.floor(pagenum)
+	local pagemax = math.floor((creative_inventory.creative_inventory_size-1) / (6*4) + 1)
+	player:set_inventory_formspec("size[13,7.5]"..
+			--"image[6,0.6;1,2;player.png]"..
+			"list[current_player;main;5,3.5;8,4;]"..
+		    "image[6.5,0;6,3;rt_logo.png]"..
+			"list[current_player;craftpreview;12,1;1,1;]"..
+			"list[detached:creative;main;0.3,0.5;4,6;"..tostring(start_i).."]"..
+			"label[2.0,6.55;"..tostring(pagenum).."/"..tostring(pagemax).."]"..
+			"button[0.3,6.5;1.6,1;creative_prev;<<]"..
+			"button[2.7,6.5;1.6,1;creative_next;>>]"..
+			"label[5,1.5;Trash:]"..
+			"list[detached:creative_trash;main;5,2;1,1;]")
+end
+minetest.register_on_joinplayer(function(player)
+	-- If in creative mode, modify player's inventory forms
+	if not minetest.setting_getbool("creative_mode") then
+		return
+	end
+	creative_inventory.set_creative_formspec(player, 0, 1)
+end)
+minetest.register_on_player_receive_fields(function(player, formname, fields)
+	if not minetest.setting_getbool("creative_mode") then
+		return
+	end
+	-- Figure out current page from formspec
+	local current_page = 0
+	local formspec = player:get_inventory_formspec()
+	local start_i = string.match(formspec, "list%[detached:creative;main;[%d.]+,[%d.]+;[%d.]+,[%d.]+;(%d+)%]")
+	start_i = tonumber(start_i) or 0
+
+	if fields.creative_prev then
+		start_i = start_i - 4*6
+	end
+	if fields.creative_next then
+		start_i = start_i + 4*6
+	end
+
+	if start_i < 0 then
+		start_i = start_i + 4*6
+	end
+	if start_i >= creative_inventory.creative_inventory_size then
+		start_i = start_i - 4*6
+	end
+		
+	if start_i < 0 or start_i >= creative_inventory.creative_inventory_size then
+		start_i = 0
+	end
+
+	creative_inventory.set_creative_formspec(player, start_i, start_i / (6*4) + 1)
+end)
+
+if minetest.setting_getbool("creative_mode") then
+	
+	minetest.register_item(":", {
+		type = "none",
+		wield_image = "wieldhand.png",
+		wield_scale = {x=1,y=1,z=2.5},
+		tool_capabilities = {
+			full_punch_interval = 0.5,
+			max_drop_level = 3,
+			groupcaps = {
+				crumbly = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
+				cracky = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
+				snappy = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
+				choppy = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
+				oddly_breakable_by_hand = {times={[1]=0.5, [2]=0.5, [3]=0.5}, uses=0, maxlevel=3},
+			},
+			damage_groups = {fleshy = 10},
+		}
+	})
+	
+	minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
+		return true
+	end)
+	
+	function minetest.handle_node_drops(pos, drops, digger)
+		if not digger or not digger:is_player() then
+			return
+		end
+		local inv = digger:get_inventory()
+		if inv then
+			for _,item in ipairs(drops) do
+				item = ItemStack(item):get_name()
+				if not inv:contains_item("main", item) then
+					inv:add_item("main", item)
+				end
+			end
+		end
+	end
+	
+end