diff --git a/ChangeLog b/ChangeLog
index 8c7270961d..99c487eb08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-03  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Damien Lespiau <damien dot lespiau at gmail dot com>
+
+	* configure.ac:
+	Fix build of the RTP plugin with mingw32 by linking to ws2_32
+	for htons() and htonl(). Fixes bug #541412.
+
 2008-07-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
 
 	* gst/matroska/matroska-demux.c: (gst_matroska_demux_class_init),
diff --git a/configure.ac b/configure.ac
index 3a0377309c..86be40353a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -144,7 +144,7 @@ AX_CREATE_STDINT_H
 
 dnl used in gst/rtp/gstasteriskh263.c
 AC_CHECK_HEADERS([netinet/in.h])
-AC_CHECK_HEADERS([winsock2.h])
+AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)
 AM_CONDITIONAL(HAVE_WINSOCK2_H, test "x$HAVE_WINSOCK2_H" = "xyes")
 
 dnl used in gst/udp