diff --git a/gst-libs/gst/gl/GNUmakefile b/gst-libs/gst/gl/GNUmakefile
new file mode 100644
index 0000000000..409841bb89
--- /dev/null
+++ b/gst-libs/gst/gl/GNUmakefile
@@ -0,0 +1,26 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+SUBPROJECT_NAME = gstlibsgstgl
+
+#gstglwindow_win32.c will be replaced by gstglwindow_cocoa.m
+gstlibsgstgl_C_FILES = \
+  gstglwindow_win32.c \
+  gstgldisplay.c \
+  gstglbuffer.c \
+  gstglfilter.c \
+  gstglshader.c
+
+#gstlibsgstgl_OBJC_FILES = gstglwindow_cocoa.m
+
+ifeq ($(GNUSTEP_TARGET_OS), mingw32)
+gstlibsgstgl_INCLUDE_DIRS = \
+  -I../../../win32/common \
+  -ID:/workspace/glib/include/glib-2.0 \
+  -ID:/workspace/gstreamer/include \
+  -ID:/workspace/glib/lib/glib-2.0/include \
+  -ID:/workspace/glew/include
+endif
+
+gstlibsgstgl_CFLAGS = -Wall -DHAVE_CONFIG_H
+
+include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/gst/gl/CMakeLists.txt b/gst/gl/CMakeLists.txt
index 2080f2b2e0..6a70e76568 100644
--- a/gst/gl/CMakeLists.txt
+++ b/gst/gl/CMakeLists.txt
@@ -37,7 +37,6 @@ endif (PNG_FOUND AND ZLIB_FOUND)
 add_library (gstopengl SHARED
   gstopengl.c
   gstglimagesink.c
-  gstglimagesink.h
   gstglupload.c
   gstgldownload.c
   gstglfilterblur.c
diff --git a/gst/gl/GNUmakefile b/gst/gl/GNUmakefile
new file mode 100644
index 0000000000..1c1bc9fc39
--- /dev/null
+++ b/gst/gl/GNUmakefile
@@ -0,0 +1,42 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+SUBPROJECT_NAME = gstgl
+
+gstgl_C_FILES += \
+  gstopengl.c \
+  gstglimagesink.c \
+  gstglupload.c \
+  gstgldownload.c \
+  gstglfilterblur.c \
+  gstglfiltercube.c \
+  gstglfilterlaplacian.c \
+  gstglfiltersobel.c \
+  gstglfilterglass.c \
+  gstglfilterapp.c \
+  gstglcolorscale.c \
+  gltestsrc.c \
+  gstgltestsrc.c \
+  gstgloverlay.c \
+  gstgldifferencematte.c \
+  gstglbumper.c \
+  gstgleffects.c
+
+gstgl_INCLUDE_DIRS += \
+  -I../../gst-libs \
+  -I../../gst-libs/gst/gl \
+  -Ieffects
+
+ifeq ($(GNUSTEP_TARGET_OS), mingw32)
+  gstgl_INCLUDE_DIRS += \
+    -I../../win32/common \
+    -ID:/workspace/glib/include/glib-2.0 \
+    -ID:/workspace/gstreamer/include \
+    -ID:/workspace/glib/lib/glib-2.0/include \
+    -ID:/workspace/png/include \
+    -ID:/workspace/z/include \
+    -ID:/workspace/glew/include
+endif
+
+gstgl_CFLAGS = -Wall -DHAVE_CONFIG_H
+
+include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/gst/gl/effects/GNUmakefile b/gst/gl/effects/GNUmakefile
new file mode 100644
index 0000000000..02c15e6eae
--- /dev/null
+++ b/gst/gl/effects/GNUmakefile
@@ -0,0 +1,37 @@
+include $(GNUSTEP_MAKEFILES)/common.make
+
+SUBPROJECT_NAME = gstgleffects
+
+gstgleffects_C_FILES = \
+  gstgleffectssources.c \
+  gstgleffectidentity.c \
+  gstgleffectmirror.c \
+  gstgleffectsqueeze.c \
+  gstgleffectstretch.c \
+  gstgleffecttunnel.c \
+  gstgleffectfisheye.c \
+  gstgleffecttwirl.c \
+  gstgleffectbulge.c \
+  gstgleffectsquare.c \
+  gstgleffectlumatocurve.c \
+  gstgleffectrgbtocurve.c \
+  gstgleffectsin.c \
+  gstgleffectglow.c \
+  gstgleffectxray.c
+
+gstgleffects_INCLUDE_DIRS = \
+  -I.. \
+  -I../../../gst-libs/gst/gl
+
+ifeq ($(GNUSTEP_TARGET_OS), mingw32)
+  gstgleffects_INCLUDE_DIRS += \
+    -I../../../win32/common \
+    -ID:/workspace/glib/include/glib-2.0 \
+    -ID:/workspace/gstreamer/include \
+    -ID:/workspace/glib/lib/glib-2.0/include \
+    -ID:/workspace/glew/include
+endif
+
+gstgleffects_CFLAGS = -Wall -DHAVE_CONFIG_H
+
+include $(GNUSTEP_MAKEFILES)/subproject.make