diff --git a/autoplace.lua b/autoplace.lua
index 06e6978..94a8620 100644
--- a/autoplace.lua
+++ b/autoplace.lua
@@ -107,7 +107,8 @@ pipes_scansurroundings = function(pos)
 
 	if (string.find(nym.name, "pipeworks:storage_tank_x") ~= nil) or
 	   (string.find(nym.name, "pipeworks:storage_tank_z") ~= nil) or
-	   (string.find(nym.name, "pipeworks:intake") ~= nil) then
+	   (string.find(nym.name, "pipeworks:intake") ~= nil) or
+	   (string.find(nym.name, "pipeworks:outlet") ~= nil) then
 		pym=1
 	end
 
diff --git a/changelog.txt b/changelog.txt
index c18214f..2d882c2 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,8 @@
 Changelog
 ---------
 
+2012-08-22:  Added outlet grate, made it participate in autoplace algorithm.
+
 2012-08-21: Made storage tank participate in autoplace algorithm.  Tuned API a 
 little to allow for more flexible placement.  Re-organized code a bit to allow 
 for some upcoming rules changes.  Made storage tanks' upper/lower fittins and 
diff --git a/devices.lua b/devices.lua
index 9d2578c..9eddcf5 100644
--- a/devices.lua
+++ b/devices.lua
@@ -279,6 +279,45 @@ minetest.register_node("pipeworks:intake", {
 	end,
 })
 
+-- outlet grate
+
+minetest.register_node("pipeworks:outlet", {
+	description = "Outlet grate",
+	drawtype = "nodebox",
+	tiles = {
+		"pipeworks_outlet_top.png",
+		"pipeworks_outlet_sides.png",
+		"pipeworks_outlet_sides.png",
+		"pipeworks_outlet_sides.png",
+		"pipeworks_outlet_sides.png",
+		"pipeworks_outlet_sides.png"
+	},
+	selection_box = {
+             	type = "fixed",
+		fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
+	},
+	node_box = {
+		type = "fixed",
+		fixed = { -0.5, -0.5, -0.5, 0.5, 0.5, 0.5 }
+	},
+	paramtype = "light",
+	groups = {snappy=3, pipe=1},
+	sounds = default.node_sound_wood_defaults(),
+	walkable = true,
+	stack_max = 99,
+	after_place_node = function(pos)
+		pipe_scanforobjects(pos)
+	end,
+	after_dig_node = function(pos)
+		pipe_scanforobjects(pos)
+	end,
+	pipelike=1,
+	on_construct = function(pos)
+	local meta = minetest.env:get_meta(pos)
+	meta:set_int("pipelike",1)
+	end,
+})
+
 -- tank
 
 minetest.register_node("pipeworks:storage_tank_x", {
diff --git a/textures/pipeworks_outlet_sides.png b/textures/pipeworks_outlet_sides.png
new file mode 100644
index 0000000..12c79c7
Binary files /dev/null and b/textures/pipeworks_outlet_sides.png differ
diff --git a/textures/pipeworks_outlet_top.png b/textures/pipeworks_outlet_top.png
new file mode 100644
index 0000000..72f7ecc
Binary files /dev/null and b/textures/pipeworks_outlet_top.png differ