diff --git a/Changelog b/Changelog
index 1709935..d682da9 100644
--- a/Changelog
+++ b/Changelog
@@ -1,5 +1,8 @@
 [Changes 1.2c01]
 
+* Improve /detach error handling and remove bogus F_SETOWN use, reported
+  by madsage. (caf)
+
 * Add /FSET WHOIS_SECURE for SSL connection info on ratbox, unreal and 
   freenode. (caf)
 
diff --git a/source/commands2.c b/source/commands2.c
index c7a30e2..050dfe8 100644
--- a/source/commands2.c
+++ b/source/commands2.c
@@ -2601,9 +2601,7 @@ static int create_ipc_socket(void)
 		write(u, "\n", 1);
 		close(u);
 	}
-#ifdef F_SETOWN
-	fcntl(s, F_SETOWN, getpid());
-#endif /* F_SETOWN */
+
 	set_non_blocking(s);
 	add_socketread(s, port, 0, socket_path, handle_reconnect, NULL);
 	save_ipc = s;
@@ -2700,7 +2698,6 @@ pid_t sid;
 		return;
 	already_detached = 1;
 	use_input = 0;
-	ioctl(0, F_SETOWN, pid);
 
 	if (create_ipc_socket())
 	{