diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index e69de29bb2..7789a79558 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -0,0 +1,24 @@
+
+lib_LTLIBRARIES = libgstgl-@GST_MAJORMINOR@.la
+
+libgstgl_@GST_MAJORMINOR@_la_SOURCES = \
+	glextensions.c \
+	gstglbuffer.c \
+	gstgldisplay.c
+
+libgstgl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/gl
+libgstgl_@GST_MAJORMINOR@include_HEADERS = \
+	glextensions.h \
+	gstglbuffer.h \
+	gstgldisplay.h
+
+libgstgl_@GST_MAJORMINOR@_la_LIBADD = \
+	$(GSTPB_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
+	$(X_LIBS) $(GL_LIBS)
+
+libgstgl_@GST_MAJORMINOR@_la_CFLAGS = \
+	$(GSTPB_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+
+libgstgl_@GST_MAJORMINOR@_la_LDFLAGS = \
+	$(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
+
diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am
index 1929e45e87..3dc0d72a93 100644
--- a/gst/gl/Makefile.am
+++ b/gst/gl/Makefile.am
@@ -1,36 +1,28 @@
 
-plugin_LTLIBRARIES = libgstglimagesink.la
+plugin_LTLIBRARIES = libgstopengl.la
 
 noinst_PROGRAMS = color_matrix
 
 AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 AM_LIBS = $(GST_BASE_LIBS)
 
-libgstglimagesink_la_SOURCES = \
+libgstopengl_la_SOURCES = \
 	glimagesink.c \
-	gstgldisplay.c \
 	gstopengl.c \
-	glextensions.c \
-	gstglbuffer.c \
 	gstglupload.c \
 	gstgldownload.c \
 	gstgltestsrc.c \
+	gstgltestsrc.h \
 	gltestsrc.c \
-	gstglfilter.c \
+	gltestsrc.h \
 	gstglfilterexample.c \
 	gstglconvert.c
-libgstglimagesink_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
-	$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS)
-libgstglimagesink_la_LIBADD = $(GL_LIBS) \
+libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GSTPB_CFLAGS) $(GL_CFLAGS) \
+	-I$(top_srcdir)/gst-libs \
+	-I$(top_srcdir)/gst-libs/gst/gl
+libgstopengl_la_LIBADD = $(GL_LIBS) \
 	$(GST_BASE_LIBS) -lgstvideo-$(GST_MAJORMINOR) \
-	$(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
-libgstglimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+	$(GSTPB_LIBS) -lgstinterfaces-$(GST_MAJORMINOR)
+libgstopengl_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 
-noinst_HEADERS = \
-	glimagesink.h \
-	gstgldisplay.h \
-	glextensions.h \
-	gstgltestsrc.h \
-	gltestsrc.h \
-	gstglbuffer.h \
-	gstglfilter.h
diff --git a/gst/gl/gstgltestsrc.c b/gst/gl/gstgltestsrc.c
index 0a9149b4ff..83fa4229d2 100644
--- a/gst/gl/gstgltestsrc.c
+++ b/gst/gl/gstgltestsrc.c
@@ -44,6 +44,7 @@
 #include "gltestsrc.h"
 #include "gstglbuffer.h"
 #include "glextensions.h"
+#include <gst/gst-i18n-plugin.h>
 
 #include <string.h>
 #include <stdlib.h>
@@ -587,7 +588,7 @@ gst_gl_test_src_create (GstPushSrc * psrc, GstBuffer ** buffer)
 not_negotiated:
   {
     GST_ELEMENT_ERROR (src, CORE, NEGOTIATION, (NULL),
-        ("format wasn't negotiated before get function"));
+        (_("format wasn't negotiated before get function")));
     return GST_FLOW_NOT_NEGOTIATED;
   }
 eos: