diff --git a/ChangeLog b/ChangeLog
index 699d99ad..6acd529d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@ ver. 0.8.3 (2008/??/??) - stable
 - Added and changed some logging level and messages.
 - Added missing ignoreregex to filters. Thanks to Klaus
   Lehmann.
+- Use poll instead of select in asyncore.loop. This should
+  solve the "Unknown error 514". Thanks to Michael Geiger and
+  Klaus Lehmann.
 
 ver. 0.8.2 (2008/03/06) - stable
 ----------
diff --git a/server/asyncserver.py b/server/asyncserver.py
index 548a8226..13a74dac 100644
--- a/server/asyncserver.py
+++ b/server/asyncserver.py
@@ -132,7 +132,7 @@ class AsyncServer(asyncore.dispatcher):
 		# Sets the init flag.
 		self.__init = True
 		# TODO Add try..catch
-		asyncore.loop()
+		asyncore.loop(use_poll = True)
 	
 	##
 	# Stops the communication server.