diff --git a/ChangeLog b/ChangeLog
index c0e9c5d03c..3fc4d687a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* sys/ximage/Makefile.am:
+	* sys/xvimage/Makefile.am:
+	  Add some _CFLAGS and _LIBS that seem to be missing
+	  and/or required for Cygwin (see #317048).
+
 2006-02-22  Wim Taymans  <wim@fluendo.com>
 
 	* ext/alsa/gstalsasrc.c:
diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index 1f210c9b50..4d0d58edd7 100644
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -1,12 +1,13 @@
 plugin_LTLIBRARIES = libgstximagesink.la
 
 libgstximagesink_la_SOURCES =  ximagesink.c ximage.c
-libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
+libgstximagesink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(X_CFLAGS)
 libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstximagesink_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
-$(X_LIBS) $(XSHM_LIBS)
+	$(GST_BASE_LIBS) \
+	$(X_LIBS) $(XSHM_LIBS)
 libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la
 
 noinst_HEADERS = ximagesink.h 
diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index ce3f7b5120..6889a006ab 100644
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -1,11 +1,13 @@
 plugin_LTLIBRARIES = libgstxvimagesink.la
 
 libgstxvimagesink_la_SOURCES =  xvimagesink.c 
-libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
+libgstxvimagesink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(X_CFLAGS)
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstxvimagesink_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \
 	$(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la \
+	$(GST_BASE_LIBS) \
+	$(GST_LIBS) \
 	$(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS)
 libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_MAJORMINOR).la