diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index 16a27a60ff..858fb910a6 100644
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -119,9 +119,11 @@ libgstvaapi_source_priv_h =			\
 	sysdeps.h				\
 	$(NULL)
 
+libgstvaapi_jpegdec_source_c = gstvaapidecoder_jpeg.c
+libgstvaapi_jpegdec_source_h = gstvaapidecoder_jpeg.h
 if USE_JPEG_DECODER
-libgstvaapi_source_c += gstvaapidecoder_jpeg.c
-libgstvaapi_source_h += gstvaapidecoder_jpeg.h
+libgstvaapi_source_c += $(libgstvaapi_jpegdec_source_c)
+libgstvaapi_source_h += $(libgstvaapi_jpegdec_source_h)
 endif
 
 libgstvaapi_drm_source_c =			\
@@ -395,6 +397,11 @@ $(PKG_VERSION_FILE): $(NEW_VERSION_FILE)
 BUILT_SOURCES	= gstvaapiversion.h
 EXTRA_DIST	= gstvaapiversion.h.in $(PKG_VERSION_FILE)
 
+EXTRA_DIST += \
+	$(libgstvaapi_jpegdec_source_c)	\
+	$(libgstvaapi_jpegdec_source_h)	\
+	$(NULL)
+
 CLEANFILES = \
 	$(OLD_VERSION_FILE)	\
 	$(NEW_VERSION_FILE)	\
diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
index 3f104e4ae7..d73bbadc33 100644
--- a/gst/vaapi/Makefile.am
+++ b/gst/vaapi/Makefile.am
@@ -48,37 +48,48 @@ libgstvaapi_source_h = \
 	gstvaapivideometa.h	\
 	$(NULL)
 
+libgstvaapi_glx_source_c = gstvaapivideoconverter_glx.c
+libgstvaapi_glx_source_h = gstvaapivideoconverter_glx.h
+
 if USE_GLX
-libgstvaapi_source_c		+= gstvaapivideoconverter_glx.c
-libgstvaapi_source_h		+= gstvaapivideoconverter_glx.h
+libgstvaapi_source_c += $(libgstvaapi_glx_source_c)
+libgstvaapi_source_h += $(libgstvaapi_glx_source_h)
 endif
 
-if USE_GST_API_1_0p
-libgstvaapi_source_c += \
+libgstvaapi_1_0p_source_c = \
 	gstvaapivideobufferpool.c \
 	gstvaapivideomemory.c	\
 	$(NULL)
 
-libgstvaapi_source_h += \
+libgstvaapi_1_0p_source_h = \
 	gstvaapivideobufferpool.h \
 	gstvaapivideomemory.h	\
 	$(NULL)
+
+if USE_GST_API_1_0p
+libgstvaapi_source_c += $(libgstvaapi_1_0p_source_c)
+libgstvaapi_source_h += $(libgstvaapi_1_0p_source_h)
 endif
 
 if USE_GST_API_0_10
-libgstvaapi_source_c += \
+libgstvaapi_0_10_source_c = \
 	gstvaapidownload.c	\
 	gstvaapipostproc.c	\
 	gstvaapiupload.c	\
 	$(NULL)
 
-libgstvaapi_source_h += \
+libgstvaapi_0_10_source_h = \
 	gstvaapidownload.h	\
 	gstvaapipostproc.h	\
 	gstvaapiupload.h	\
 	$(NULL)
 endif
 
+if USE_GST_API_0_10
+libgstvaapi_source_c += $(libgstvaapi_0_10_source_c)
+libgstvaapi_source_h += $(libgstvaapi_0_10_source_h)
+endif
+
 libgstvaapi_la_SOURCES		= $(libgstvaapi_source_c)
 noinst_HEADERS			= $(libgstvaapi_source_h)
 
@@ -104,5 +115,14 @@ libgstvaapi_la_LIBADD =	\
 libgstvaapi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvaapi_la_LIBTOOLFLAGS = --tag=disable-static
 
+EXTRA_DIST = \
+	$(libgstvaapi_glx_source_c)	\
+	$(libgstvaapi_glx_source_h)	\
+	$(libgstvaapi_1_0p_source_c)	\
+	$(libgstvaapi_1_0p_source_h)	\
+	$(libgstvaapi_0_10_source_c)	\
+	$(libgstvaapi_0_10_source_h)	\
+	$(NULL)
+
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = Makefile.in