diff --git a/autoplace.lua b/autoplace.lua
index c70095f..7e6a329 100644
--- a/autoplace.lua
+++ b/autoplace.lua
@@ -130,22 +130,22 @@ function pipes_scansurroundings(pos)
 -- ...spigots...
 
 	if (string.find(nxm.name, "pipeworks:spigot") ~= nil)
-	  and nxm.param2 == 2 then
+	  and nxm.param2 == 1 then
 		pxm=1
 	end
 
 	if (string.find(nxp.name, "pipeworks:spigot") ~= nil)
-	  and nxp.param2 == 0 then
+	  and nxp.param2 == 3 then
 		pxp=1
 	end
 
 	if (string.find(nzm.name, "pipeworks:spigot") ~= nil)
-	  and nzm.param2 == 1 then
+	  and nzm.param2 == 0 then
 		pzm=1
 	end
 
 	if (string.find(nzp.name, "pipeworks:spigot") ~= nil)
-	  and nzp.param2 == 3 then
+	  and nzp.param2 == 2 then
 		pzp=1
 	end
 
diff --git a/devices.lua b/devices.lua
index fadba09..549c643 100644
--- a/devices.lua
+++ b/devices.lua
@@ -171,7 +171,7 @@ minetest.register_node("pipeworks:grating", {
 -- outlet spigot
 
 	local spigotboxes = {}
-	pipe_addbox(spigotboxes, pipe_leftstub)
+	pipe_addbox(spigotboxes, pipe_backstub)
 	pipe_addbox(spigotboxes, spigot_bottomstub)
 	pipe_addbox(spigotboxes, pipe_bendsphere)
 
@@ -209,7 +209,7 @@ minetest.register_node("pipeworks:spigot", {
 	},
 	selection_box = {
 		type = "fixed",
-		fixed = { -8/16, -6/16, -2/16, 2/16, 2/16, 2/16 }
+		fixed = { -2/16, -6/16, -2/16, 2/16, 2/16, 8/16 }
 	}
 })