diff --git a/ChangeLog b/ChangeLog
index fbc1581a3..d8af7d9b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-05  Alexander Gottwald  <ago@freedesktop.org>
+
+	* hw/xwin/Makefile.am:
+	Build miinitext.c and fbcmap.c as DDX specific files
+
+	* configure.ac:
+	Do not define _POSIX_SOURCE on cygwin.
+
 2005-07-05  Alexander Gottwald  <ago@freedesktop.org>
 
 	* fb/Makefile.am:
diff --git a/configure.ac b/configure.ac
index ea958f0ae..7fdd41137 100644
--- a/configure.ac
+++ b/configure.ac
@@ -609,7 +609,14 @@ AC_DEFINE(XFree86XDGA,1,[Build XDGA support])
 AC_DEFINE(XF86BIGFONT,1,[Build XFree86 BigFont extension])
 AC_DEFINE(XResExtension,1,[Build XRes extension])
 AC_DEFINE(DPMSExtension,1,[Build DPMS extension])
-AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source])
+
+dnl CYGWIN does not define fd_set if _POSIX_SOURCE is defined
+case $host_os in
+	cygwin*) ;;
+	*) 
+		AC_DEFINE(_POSIX_SOURCE,500,[POSIX-compliant source])
+		;;
+esac
 AC_DEFINE(_XOPEN_SOURCE,1,[X/Open-compliant source])
 AC_DEFINE(_BSD_SOURCE,1,[BSD-compliant source])
 
diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 7bbbf0fd7..97ca53fbb 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -105,6 +105,8 @@ SRCS =	InitInput.c \
 	winwakeup.c \
 	winwindow.c \
 	winwndproc.c \
+	$(top_srcdir)/mi/miinitext.c \
+	$(top_srcdir)/fb/fbcmap.c \
 	$(SRCS_CLIPBOARD) \
 	$(SRCS_GLX_WINDOWS) \
 	$(SRCS_MULTIWINDOW) \