diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index ce16fcba0c..c9c4bd1f39 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -19,13 +19,11 @@ libgstgl_@GST_MAJORMINOR@include_HEADERS = \
 libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
 	$(GST_BASE_LIBS) $(GST_LIBS) \
-	${top_builddir}/gst-libs/gst/freeglut/libgstfreeglut-$(GST_MAJORMINOR).la \
 	-lGLU -lGLEW $(GL_LIBS) $(X_LIBS)
 
 libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
 	$(GL_CFLAGS) $(X_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
-	-I$(top_srcdir)/gst-libs/gst/freeglut
+	$(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 
 libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \
 	$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
diff --git a/gst-libs/gst/gl/gstglwindow_x11.c b/gst-libs/gst/gl/gstglwindow_x11.c
index bde9ec1d60..6b447f3bc0 100644
--- a/gst-libs/gst/gl/gstglwindow_x11.c
+++ b/gst-libs/gst/gl/gstglwindow_x11.c
@@ -447,7 +447,10 @@ gst_gl_window_run_loop (GstGLWindow *window)
 
       case Expose:
         if (priv->draw_cb)
+        {
           priv->draw_cb (priv->draw_data);
+          glXSwapBuffers (priv->device, priv->internal_win_id);
+        }
         break;
 
       case VisibilityNotify: