diff --git a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
index c54b0331..34e532df 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper-nightly.json
@@ -39,14 +39,14 @@
     },
     "modules": [
         "flathub/shared-modules/gudev/gudev.json",
-        "testing/liba52.json",
+        "flathub/lib/liba52.json",
         "flathub/lib/libmpeg2.json",
         "flathub/lib/libdv.json",
         "flathub/lib/libdvdcss.json",
         "flathub/lib/libdvdread.json",
         "flathub/lib/libdvdnav.json",
         "flathub/lib/libass.json",
-        "testing/libmicrodns.json",
+        "flathub/lib/libmicrodns.json",
         "testing/dav1d.json",
         "testing/gstreamer.json",
         "testing/gst-plugins-rs.json",
diff --git a/pkgs/flatpak/com.github.rafostar.Clapper.json b/pkgs/flatpak/com.github.rafostar.Clapper.json
index 2531ffac..43e0588b 100644
--- a/pkgs/flatpak/com.github.rafostar.Clapper.json
+++ b/pkgs/flatpak/com.github.rafostar.Clapper.json
@@ -31,7 +31,7 @@
     ],
     "modules": [
         "flathub/shared-modules/gudev/gudev.json",
-        "testing/liba52.json",
+        "flathub/lib/liba52.json",
         "flathub/lib/libmpeg2.json",
         "flathub/lib/libdv.json",
         "flathub/lib/libdvdcss.json",
@@ -39,7 +39,7 @@
         "flathub/lib/libdvdnav.json",
         "flathub/lib/libass.json",
         "flathub/lib/uchardet.json",
-        "testing/libmicrodns.json",
+        "flathub/lib/libmicrodns.json",
         "flathub/gstreamer-1.0/gstreamer.json",
         "testing/gtuber.json",
         {
diff --git a/pkgs/flatpak/flathub b/pkgs/flatpak/flathub
index 017cf7b2..49f27907 160000
--- a/pkgs/flatpak/flathub
+++ b/pkgs/flatpak/flathub
@@ -1 +1 @@
-Subproject commit 017cf7b263f083ad1be90c77842d95acdbcb8434
+Subproject commit 49f279076f23e38986869899096d2fa7c9bb4d7d
diff --git a/pkgs/flatpak/testing/a52dec-configure-optflags.patch b/pkgs/flatpak/testing/a52dec-configure-optflags.patch
deleted file mode 100644
index 8752a62e..00000000
--- a/pkgs/flatpak/testing/a52dec-configure-optflags.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./configure~	2002-07-28 06:50:42.000000000 +0300
-+++ ./configure	2003-04-13 17:20:53.000000000 +0300
-@@ -5366,13 +5366,13 @@
- 
-         case "$host" in
-     i?86-* | k?-*)
--	case "$host" in
--	i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";;
--	i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";;
--	i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";;
--	i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";;
--	k6-*)   TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";;
--	esac
-+#	case "$host" in
-+#	i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";;
-+#	i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";;
-+#	i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";;
-+#	i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";;
-+#	k6-*)   TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";;
-+#	esac
- 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if $CC supports $TRY_CFLAGS $CFLAGS flags" >&5
- printf %s "checking if $CC supports $TRY_CFLAGS $CFLAGS flags... " >&6; }
-    SAVE_CFLAGS="$CFLAGS"
diff --git a/pkgs/flatpak/testing/liba52.json b/pkgs/flatpak/testing/liba52.json
deleted file mode 100644
index cfae355d..00000000
--- a/pkgs/flatpak/testing/liba52.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    "name": "liba52",
-    "config-opts": [ "--enable-shared", "--disable-static" ],
-    "rm-configure": true,
-    "cleanup": [ "/bin/*a52*" ],
-    "sources": [
-        {
-            "type": "archive",
-            "url": "https://distfiles.adelielinux.org/source/a52dec/a52dec-0.8.0.tar.gz",
-            "sha256": "03c181ce9c3fe0d2f5130de18dab9bd8bc63c354071515aa56983c74a9cffcc9"
-        },
-        {
-            "type": "patch",
-            "path": "a52dec-configure-optflags.patch"
-        },
-        {
-            "type": "script",
-            "commands": [
-                "autoreconf -fiv"
-            ],
-            "dest-filename": "autogen.sh"
-        }
-    ]
-}
diff --git a/pkgs/flatpak/testing/libmicrodns.json b/pkgs/flatpak/testing/libmicrodns.json
deleted file mode 100644
index 79b19676..00000000
--- a/pkgs/flatpak/testing/libmicrodns.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "name": "libmicrodns",
-    "buildsystem": "meson",
-    "config-opts": [
-        "--buildtype=release",
-        "-Dtests=disabled",
-        "-Dexamples=disabled"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig"
-    ],
-    "sources": [
-        {
-            "type": "git",
-            "url": "https://github.com/videolabs/libmicrodns.git",
-            "tag": "0.2.0",
-            "commit": "deb7ed7bf05dc26802a0ca1987049b31405b8930"
-        }
-    ]
-}