diff --git a/ChangeLog b/ChangeLog
index d89e2fb124..0c65a863a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2004-08-09  David Schleef  <ds@schleef.org>
+
+	Patch from Gernot Ziegler <gz@lysator.liu.se> rewriting the
+	GL sink plugin.  (Bug #147302)
+
+	* configure.ac: Test for OpenGL
+	* sys/Makefile.am: Use test for OpenGL
+	* sys/glsink/Makefile.am:
+	* sys/glsink/glimagesink.c: rewrite
+	* sys/glsink/glimagesink.h: rewrite
+
 2004-08-09  David Schleef  <ds@schleef.org>
 
 	* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_base_init):  Only allow
diff --git a/configure.ac b/configure.ac
index fa16815187..6ffc6b68de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -524,9 +524,14 @@ GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
   AC_CHECK_HEADER(linux/cdrom.h, HAVE_VCD="yes", HAVE_VCD="no")
 ])
 
+dnl *** OpenGL ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
+GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
+  AC_CHECK_HEADER(GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
+])
+
 dnl *** CDROM Audio ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_CDROM, true)
-
 GST_CHECK_FEATURE(CDROM, [CDROM Audio], cdrom, [
   AC_CHECK_HEADERS(linux/cdrom.h) dnl linux
   AC_CHECK_HEADERS(sys/cdio.h) dnl almost everything else
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 9f53cdb34d..7028846af5 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -70,9 +70,15 @@ else
 CDROM_DIR=
 endif
 
+if USE_OPENGL
+GL_DIR=glsink
+else
+GL_DIR=
+endif
+
 SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(OSX_AUDIO_DIR) $(OSX_VIDEO_DIR) $(QCAM_DIR) \
         $(SUNAUDIO_DIR) $(V4L_DIR) $(V4L2_DIR) $(VCD_DIR) $(CDROM_DIR) \
-        $(XI_DIR) $(XV_DIR)
+        $(XI_DIR) $(XV_DIR) $(GL_DIR)
 
 DIST_SUBDIRS=dxr3 oss osxaudio osxvideo qcam sunaudio v4l v4l2 vcd ximage \
         xvimage glsink cdrom