diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c
index 367a31f41c5..78d977f32fe 100644
--- a/usr.sbin/powerd/powerd.c
+++ b/usr.sbin/powerd/powerd.c
@@ -379,7 +379,7 @@ devd_init(void)
 	struct sockaddr_un devd_addr;
 
 	bzero(&devd_addr, sizeof(devd_addr));
-	if ((devd_pipe = socket(PF_LOCAL, SOCK_STREAM, 0)) < 0) {
+	if ((devd_pipe = socket(PF_LOCAL, SOCK_STREAM|SOCK_NONBLOCK, 0)) < 0) {
 		if (vflag)
 			warn("%s(): socket()", __func__);
 		return (-1);
@@ -396,13 +396,6 @@ devd_init(void)
 		return (-1);
 	}
 
-	if (fcntl(devd_pipe, F_SETFL, O_NONBLOCK) == -1) {
-		if (vflag)
-			warn("%s(): fcntl()", __func__);
-		close(devd_pipe);
-		return (-1);
-	}
-
 	return (devd_pipe);
 }