diff --git a/Makefile.in b/Makefile.in
index fdfea427..619bfd65 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -122,7 +122,7 @@ GSTREAMER_MESON_ARGS := \
 
 GSTREAMER_DEPENDS = gst_orc
 
-$(eval $(call rules-source,gstreamer,$(SRCDIR)/gstreamer))
+$(eval $(call rules-source,gstreamer,$(SRCDIR)/gstreamer/subprojects/gstreamer))
 $(eval $(call rules-meson,gstreamer,32))
 $(eval $(call rules-meson,gstreamer,64))
 
@@ -152,8 +152,7 @@ GST_BASE_MESON_ARGS := \
 	-Dplayback=enabled \
 	-Dtheora=enabled \
 	-Dtypefind=enabled \
-	-Dvideoconvert=enabled \
-	-Dvideoscale=enabled \
+	-Dvideoconvertscale=enabled \
 	-Dvorbis=enabled \
 	-Dorc=enabled \
 	-Dx11=enabled \
@@ -164,7 +163,7 @@ GST_BASE_MESON_ARGS := \
 
 GST_BASE_DEPENDS = gst_orc graphene gstreamer
 
-$(eval $(call rules-source,gst_base,$(SRCDIR)/gst-plugins-base))
+$(eval $(call rules-source,gst_base,$(SRCDIR)/gstreamer/subprojects/gst-plugins-base))
 $(eval $(call rules-meson,gst_base,32))
 $(eval $(call rules-meson,gst_base,64))
 
@@ -194,7 +193,7 @@ GST_GOOD_MESON_ARGS := \
 
 GST_GOOD_DEPENDS = gst_orc gstreamer gst_base
 
-$(eval $(call rules-source,gst_good,$(SRCDIR)/gst-plugins-good))
+$(eval $(call rules-source,gst_good,$(SRCDIR)/gstreamer/subprojects/gst-plugins-good/))
 $(eval $(call rules-meson,gst_good,32))
 $(eval $(call rules-meson,gst_good,64))
 
@@ -225,7 +224,7 @@ $(OBJ)/.ffmpeg-dist64:
 
 GST_LIBAV_DEPENDS = gst_orc gstreamer gst_base ffmpeg
 
-$(eval $(call rules-source,gst_libav,$(SRCDIR)/gst-libav))
+$(eval $(call rules-source,gst_libav,$(SRCDIR)/gstreamer/subprojects/gst-libav))
 $(eval $(call rules-meson,gst_libav,32))
 $(eval $(call rules-meson,gst_libav,64))
 
diff --git a/gst-libav b/gst-libav
deleted file mode 160000
index e896aabe..00000000
--- a/gst-libav
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e896aabe3c3d278510fb567712c4a55ed0eae075
diff --git a/gst-plugins-base b/gst-plugins-base
deleted file mode 160000
index 57fb883b..00000000
--- a/gst-plugins-base
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 57fb883b3f8c6d7a397afc0dfc4a7c2e5af05579
diff --git a/gst-plugins-good b/gst-plugins-good
deleted file mode 160000
index 56dec037..00000000
--- a/gst-plugins-good
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 56dec037a80266add6853e4b06e2dc379de757d1
diff --git a/gstreamer b/gstreamer
index 71c213f9..bf6ce1d6 160000
--- a/gstreamer
+++ b/gstreamer
@@ -1 +1 @@
-Subproject commit 71c213f99ad5c8fc8f36a26238483f2bdf7d846a
+Subproject commit bf6ce1d64a0697e7910826147b48f8f658366a5a