diff --git a/ChangeLog b/ChangeLog
index 8ac7147c3..542694b85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-02-15  Eric Anholt  <anholt@FreeBSD.org>
+
+	* include/dix-config.h.in:
+	Merge from HEAD:
+	Add #undef BSD44SOCKETS, without which the listener socket on FreeBSD
+	would be created without the port number due to xtrans's define not
+	being used when xtrans was compiled in the X Server.
+
 2006-02-15  Eric Anholt  <anholt@FreeBSD.org>
 
 	* configure.ac:
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index f41da9f20..960080e8f 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -421,4 +421,7 @@
 /* System is BSD-like */
 #undef CSRG_BASED
 
+/* Define to 1 if `struct sockaddr_in' has a `sin_len' member */
+#undef BSD44SOCKETS
+
 #endif /* _DIX_CONFIG_H_ */