diff --git a/ChangeLog b/ChangeLog
index 63c413cbe6..245f7e14a8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-02  Sebastian Dröge  <sebastian.droege@collabora.co.uk>
+
+	Patch by: Tal Shalif <tshalif at nargila dot org>
+
+	* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_initsdl):
+	Use g_setenv() and g_unsetenv() instead of setenv() to fix compilation
+	with mingw. Fixes bug #545247.
+
 2008-08-02  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* configure.ac:
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index 321b7e89d1..ef8147ea87 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -593,12 +593,12 @@ gst_sdlvideosink_initsdl (GstSDLVideoSink * sdlvideosink)
   }
 
   if (!sdlvideosink->xwindow_id) {
-    unsetenv ("SDL_WINDOWID");
+    g_unsetenv ("SDL_WINDOWID");
   } else {
     char SDL_hack[32];
 
     sprintf (SDL_hack, "%lu", sdlvideosink->xwindow_id);
-    setenv ("SDL_WINDOWID", SDL_hack, 1);
+    g_setenv ("SDL_WINDOWID", SDL_hack, 1);
   }
 
   /* Initialize the SDL library */