diff --git a/mods/screwdriver/init.lua b/mods/screwdriver/init.lua
new file mode 100644
index 00000000..42958288
--- /dev/null
+++ b/mods/screwdriver/init.lua
@@ -0,0 +1,83 @@
+local function nextrange(x, max)
+	x = x + 1
+	if x > max then
+		x = 0
+	end
+	return x
+end
+
+-- Handles rotation
+local function screwdriver_handler(itemstack, user, pointed_thing, mode)
+	if pointed_thing.type ~= "node" then
+		return
+	end
+
+	local pos = pointed_thing.under
+	local keys = user:get_player_control()
+	local player_name = user:get_player_name()
+
+	if minetest.is_protected(pos, user:get_player_name()) then
+		minetest.record_protection_violation(pos, user:get_player_name())
+		return
+	end
+
+	local node = minetest.get_node(pos)
+	local ndef = minetest.registered_nodes[node.name]
+	if not ndef or not ndef.paramtype2 == "facedir" or
+			(ndef.drawtype == "nodebox" and
+			not ndef.node_box.type == "fixed") or
+			node.param2 == nil then
+		return
+	end
+
+	-- Set param2
+	local n = node.param2
+	local axisdir = math.floor(n / 4)
+	local rotation = n - axisdir * 4
+	if mode == 1 then
+		n = axisdir * 4 + nextrange(rotation, 3)
+	elseif mode == 3 then
+		n = nextrange(axisdir, 5) * 4
+	end
+	
+	node.param2 = n
+	minetest.swap_node(pos, node)
+
+	local item_wear = tonumber(itemstack:get_wear())
+	item_wear = item_wear + 300 -- was 327
+	if item_wear > 65535 then
+		itemstack:clear()
+		return itemstack
+	end
+	itemstack:set_wear(item_wear)
+	return itemstack
+end
+
+-- Screwdriver
+minetest.register_tool("screwdriver:screwdriver", {
+	description = "Screwdriver (left-click rotates face, right-click rotates axis)",
+	inventory_image = "screwdriver.png",
+	on_use = function(itemstack, user, pointed_thing)
+		screwdriver_handler(itemstack, user, pointed_thing, 1)
+		return itemstack
+	end,
+	on_place = function(itemstack, user, pointed_thing)
+		screwdriver_handler(itemstack, user, pointed_thing, 3)
+		return itemstack
+	end,
+})
+
+
+minetest.register_craft({
+	output = "screwdriver:screwdriver",
+	recipe = {
+		{"default:steel_ingot"},
+		{"group:stick"}
+	}
+})
+
+-- Compatibility with original mod
+minetest.register_alias("screwdriver:screwdriver1", "screwdriver:screwdriver")
+minetest.register_alias("screwdriver:screwdriver2", "screwdriver:screwdriver")
+minetest.register_alias("screwdriver:screwdriver3", "screwdriver:screwdriver")
+minetest.register_alias("screwdriver:screwdriver4", "screwdriver:screwdriver")
diff --git a/mods/screwdriver/readme.txt b/mods/screwdriver/readme.txt
new file mode 100644
index 00000000..64e7714b
--- /dev/null
+++ b/mods/screwdriver/readme.txt
@@ -0,0 +1,19 @@
+Minetest mod: screwdriver
+Edited by TenPlus1 on 2nd Sep 2014
+==================================
+
+License of source code:
+-----------------------
+Copyright (C) 2013 RealBadAngel, Maciej Kasatkin <mk@realbadangel.pl>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+http://www.gnu.org/licenses/lgpl-2.1.html
+
+License of media (textures and sounds)
+--------------------------------------
+Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
+http://creativecommons.org/licenses/by-sa/3.0/
\ No newline at end of file
diff --git a/mods/screwdriver/textures/screwdriver.png b/mods/screwdriver/textures/screwdriver.png
new file mode 100644
index 00000000..f471756d
Binary files /dev/null and b/mods/screwdriver/textures/screwdriver.png differ