diff --git a/Changes b/Changes
index ae07ccd1b..1598fb45a 100644
--- a/Changes
+++ b/Changes
@@ -1281,3 +1281,4 @@
 - Removed old poll code from s_bsd.c and s_debug.c also do_client_queue function
   from s_bsd.c
 - Removed old set_blocking function from s_bsd.c
+- SocketLoop is become general IO loop for *nix too.
diff --git a/src/ircd.c b/src/ircd.c
index 5e647d19d..0ce7a07be 100644
--- a/src/ircd.c
+++ b/src/ircd.c
@@ -1471,6 +1471,9 @@ int InitwIRCD(int argc, char *argv[])
 
 #ifdef _WIN32
 	return 1;
+#else
+	SocketLoop(NULL);
+#endif
 }
 
 
@@ -1483,7 +1486,7 @@ void SocketLoop(void *dummy)
 	TS   nextfdlistcheck = 0;	/*end of priority code */
 #endif
 	
-	
+#ifdef _WIN32	
 	while (1)
 #else
 	nextping = timeofday;