diff --git a/ChangeLog b/ChangeLog
index affee131a..4fe35ba73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20000201
+ - Use socket pairs by default (instead of pipes). Prevents race condition
+   on several (buggy) OSs. Report and fix from tridge@linuxcare.com
+
 20000127
  - Seed OpenSSL's random number generator before generating RSA keypairs
  - Split random collector into seperate file
diff --git a/includes.h b/includes.h
index 3abf2851d..746e76e58 100644
--- a/includes.h
+++ b/includes.h
@@ -122,6 +122,6 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
  * Define this to use pipes instead of socketpairs for communicating with the
  * client program.  Socketpairs do not seem to work on all systems.
  */
-#define USE_PIPES 1
+/* #define USE_PIPES 1 */
 
 #endif				/* INCLUDES_H */