diff --git a/configure.ac b/configure.ac
index fee139e6a1..0d36f0462d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,7 +135,8 @@ AC_OUTPUT([
     gst-libs/gst/Makefile
     gst-libs/gst/vaapi/Makefile
     sys/Makefile
-    sys/vaapi/Makefile
+    sys/vaapiconvert/Makefile
+    sys/vaapisink/Makefile
     tests/Makefile
     tests/examples/Makefile
     tests/examples/generic/Makefile
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 37d365da29..106bb4192e 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = vaapi
+SUBDIRS = vaapiconvert vaapisink
 
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/sys/vaapiconvert/Makefile.am b/sys/vaapiconvert/Makefile.am
new file mode 100644
index 0000000000..549bd993c7
--- /dev/null
+++ b/sys/vaapiconvert/Makefile.am
@@ -0,0 +1,15 @@
+plugin_LTLIBRARIES = libgstvaapiconvert.la
+
+libgstvaapiconvert_la_SOURCES =	\
+	$(NULL)
+
+noinst_HEADERS =		\
+	$(NULL)
+
+libgstvaapiconvert_la_CFLAGS	= $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+libgstvaapiconvert_la_LIBADD	= $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstvaapiconvert_la_LDFLAGS	= 
+libgstvaapiconvert_la_LIBTOOLFLAGS = --tag=disable-static
+
+# Extra clean files so that maintainer-clean removes *everything*
+MAINTAINERCLEANFILES = Makefile.in