diff --git a/flatpak-runtime.yaml b/flatpak-runtime.yaml
index c60c109..935a0e6 100644
--- a/flatpak-runtime.yaml
+++ b/flatpak-runtime.yaml
@@ -49,8 +49,10 @@ data:
       - clutter-gtk
       - cogl
       - colord-libs
+      - compat-gdbm
+      - compat-giflib
       - compat-libicu57
-      - compat-openssl10
+      - compat-libvpx4
       - compat-readline6
       - coreutils
       - coreutils-common
@@ -94,8 +96,8 @@ data:
       - fontconfig
       - fontpackages-filesystem
       - freetype
+      - fribidi
       - gawk
-      - gc
       - libgcab1
       - libatomic
       - libgcc
@@ -109,7 +111,6 @@ data:
       - gdk-pixbuf2-modules
       - geoclue2
       - geoclue2-libs
-      - giflib
       - gjs
       - glib-networking
       - glib2
@@ -131,6 +132,7 @@ data:
       - gobject-introspection
       - google-crosextra-caladea-fonts
       - google-crosextra-carlito-fonts
+      - google-noto-emoji-color-fonts
       - gpgme
       - graphite2
       - grep
@@ -143,7 +145,6 @@ data:
       - gtk2-engines
       - gtk-update-icon-cache
       - gtk3
-      - guile
       - gvfs-client
       - gzip
       - harfbuzz
@@ -205,7 +206,6 @@ data:
       - libarchive
       - libassuan
       - libasyncns
-      - libatomic_ops
       - libcanberra
       - libcanberra-gtk2
       - libcanberra-gtk3
@@ -303,20 +303,17 @@ data:
       - libxshmfence
       - libxslt
       - llvm-libs
-      - llvm5.0-libs
       - logrotate
       - device-mapper
       - device-mapper-libs
       - lz4-libs
       - ModemManager-glib
-      - make
       - libmcpp
       - mcpp
       - mesa-libEGL
       - mesa-libGL
       - mesa-libgbm
       - mesa-libglapi
-      - mesa-libwayland-egl
       - mesa-vulkan-drivers
       - mlocate
       - mozjs52
@@ -336,7 +333,6 @@ data:
       - nss
       - nss-sysinit
       - nss-tools
-      - nss-pem
       - nss-softokn
       - nss-softokn-freebl
       - nss-util
@@ -397,6 +393,7 @@ data:
       - soundtouch
       - speex
       - speexdsp
+      - spirv-tools-libs
       - sqlite-libs
       - systemd
       - systemd-libs
@@ -419,9 +416,11 @@ data:
       - vulkan-filesystem
       - libwayland-client
       - libwayland-cursor
+      - libwayland-egl
       - libwayland-server
       - webkit2gtk3
       - webkit2gtk3-jsc
+      - webrtc-audio-processing
       - which
       - woff2
       - words
@@ -473,8 +472,10 @@ data:
       - cdparanoia-libs
       - chkconfig
       - colord-libs
+      - compat-gdbm
+      - compat-giflib
       - compat-libicu57
-      - compat-openssl10
+      - compat-libvpx4
       - compat-readline6
       - coreutils
       - coreutils-common
@@ -516,8 +517,8 @@ data:
       - fontconfig
       - fontpackages-filesystem
       - freetype
+      - fribidi
       - gawk
-      - gc
       - libgcab1
       - libatomic
       - libgcc
@@ -530,7 +531,6 @@ data:
       - gdk-pixbuf2-modules
       - geoclue2
       - geoclue2-libs
-      - giflib
       - glib-networking
       - glib2
       - glibc
@@ -559,7 +559,6 @@ data:
       - gstreamer1-plugins-base
       - gtk-update-icon-cache
       - gtk3
-      - guile
       - gzip
       - harfbuzz
       - harfbuzz-icu
@@ -614,7 +613,6 @@ data:
       - libarchive
       - libassuan
       - libasyncns
-      - libatomic_ops
       - libcap
       - libcap-ng
       - libcroco
@@ -700,20 +698,17 @@ data:
       - libxshmfence
       - libxslt
       - llvm-libs
-      - llvm5.0-libs
       - logrotate
       - device-mapper
       - device-mapper-libs
       - lz4-libs
       - ModemManager-glib
-      - make
       - libmcpp
       - mcpp
       - mesa-libEGL
       - mesa-libGL
       - mesa-libgbm
       - mesa-libglapi
-      - mesa-libwayland-egl
       - mesa-vulkan-drivers
       - mlocate
       - mpfr
@@ -731,7 +726,6 @@ data:
       - nss
       - nss-sysinit
       - nss-tools
-      - nss-pem
       - nss-softokn
       - nss-softokn-freebl
       - nss-util
@@ -787,6 +781,7 @@ data:
       - soundtouch
       - speex
       - speexdsp
+      - spirv-tools-libs
       - sqlite-libs
       - systemd
       - systemd-libs
@@ -805,7 +800,9 @@ data:
       - vulkan-filesystem
       - libwayland-client
       - libwayland-cursor
+      - libwayland-egl
       - libwayland-server
+      - webrtc-audio-processing
       - which
       - words
       - xcb-util
@@ -901,8 +898,10 @@ data:
       - cogl
       - cogl-devel
       - colord-libs
+      - compat-gdbm
+      - compat-giflib
       - compat-libicu57
-      - compat-openssl10
+      - compat-libvpx4
       - compat-readline6
       - coreutils
       - coreutils-common
@@ -982,6 +981,7 @@ data:
       - fpc-srpm-macros
       - freetype
       - freetype-devel
+      - fribidi
       - fuse-libs
       - gawk
       - gc
@@ -1058,6 +1058,7 @@ data:
       - gobject-introspection-devel
       - google-crosextra-caladea-fonts
       - google-crosextra-carlito-fonts
+      - google-noto-emoji-color-fonts
       - gperf
       - gpgme
       - gpgme-devel
@@ -1106,7 +1107,6 @@ data:
       - ibus-gtk3
       - ibus-libs
       - ibus-setup
-      - ibus-wayland
       - icu
       - libicu
       - libicu-devel
@@ -1269,6 +1269,7 @@ data:
       - libnotify
       - libnotify-devel
       - libnsl2
+      - libnsl2-devel
       - libogg
       - libogg-devel
       - libpaper
@@ -1318,6 +1319,7 @@ data:
       - libtiff
       - libtiff-devel
       - libtirpc
+      - libtirpc-devel
       - libtool
       - libtool-ltdl
       - libtool-ltdl-devel
@@ -1362,10 +1364,10 @@ data:
       - libxslt
       - libxslt-devel
       - libyaml
+      - libyaml-devel
       - llvm
       - llvm-devel
       - llvm-libs
-      - llvm5.0-libs
       - logrotate
       - lua-libs
       - device-mapper
@@ -1389,8 +1391,6 @@ data:
       - mesa-libgbm
       - mesa-libgbm-devel
       - mesa-libglapi
-      - mesa-libwayland-egl
-      - mesa-libwayland-egl-devel
       - mesa-vulkan-devel
       - mesa-vulkan-drivers
       - meson
@@ -1425,13 +1425,13 @@ data:
       - nss-pkcs11-devel
       - nss-sysinit
       - nss-tools
-      - nss-pem
       - nss-softokn
       - nss-softokn-devel
       - nss-softokn-freebl
       - nss-softokn-freebl-devel
       - nss-util
       - nss-util-devel
+      - nss_nis
       - numactl-libs
       - ocaml-srpm-macros
       - oniguruma
@@ -1614,6 +1614,7 @@ data:
       - python3-pyparsing
       - python2-asn1crypto
       - python2-beaker
+      - python3-beaker
       - python2-cffi
       - python2-cryptography
       - python2-enum34
@@ -1621,7 +1622,9 @@ data:
       - python2-idna
       - python2-ipaddress
       - python2-mako
+      - python3-mako
       - python2-markupsafe
+      - python3-markupsafe
       - python2-paste
       - python2-pip
       - python3-pip
@@ -1692,6 +1695,7 @@ data:
       - speex-devel
       - speexdsp
       - speexdsp-devel
+      - spirv-tools-libs
       - sqlite
       - sqlite-devel
       - sqlite-libs
@@ -1705,6 +1709,8 @@ data:
       - systemd-udev
       - systemtap-sdt-devel
       - tar
+      - tcl
+      - tcl-devel
       - teckit
       - info
       - texinfo
@@ -1793,6 +1799,8 @@ data:
       - libuuid-devel
       - util-linux
       - vala
+      - vala-compat
+      - vala-compat-tools
       - valgrind
       - valgrind-devel
       - valgrind-tools-devel
@@ -1806,6 +1814,7 @@ data:
       - vulkan-filesystem
       - libwayland-client
       - libwayland-cursor
+      - libwayland-egl
       - libwayland-server
       - wayland-devel
       - wayland-protocols-devel
@@ -1813,6 +1822,7 @@ data:
       - webkit2gtk3-devel
       - webkit2gtk3-jsc
       - webkit2gtk3-jsc-devel
+      - webrtc-audio-processing
       - which
       - woff2
       - words
@@ -1920,8 +1930,10 @@ data:
       - cmake-filesystem
       - cmake-rpm-macros
       - colord-libs
+      - compat-gdbm
+      - compat-giflib
       - compat-libicu57
-      - compat-openssl10
+      - compat-libvpx4
       - compat-readline6
       - coreutils
       - coreutils-common
@@ -1997,6 +2009,7 @@ data:
       - fpc-srpm-macros
       - freetype
       - freetype-devel
+      - fribidi
       - fuse-libs
       - gawk
       - gc
@@ -2107,7 +2120,6 @@ data:
       - ibus-gtk3
       - ibus-libs
       - ibus-setup
-      - ibus-wayland
       - icu
       - libicu
       - libicu-devel
@@ -2255,6 +2267,7 @@ data:
       - libmpcdec
       - libnotify
       - libnsl2
+      - libnsl2-devel
       - libogg
       - libogg-devel
       - libpaper
@@ -2301,6 +2314,7 @@ data:
       - libtiff
       - libtiff-devel
       - libtirpc
+      - libtirpc-devel
       - libtool
       - libtool-ltdl
       - libtool-ltdl-devel
@@ -2342,10 +2356,10 @@ data:
       - libxslt
       - libxslt-devel
       - libyaml
+      - libyaml-devel
       - llvm
       - llvm-devel
       - llvm-libs
-      - llvm5.0-libs
       - logrotate
       - lua-libs
       - device-mapper
@@ -2368,8 +2382,6 @@ data:
       - mesa-libgbm
       - mesa-libgbm-devel
       - mesa-libglapi
-      - mesa-libwayland-egl
-      - mesa-libwayland-egl-devel
       - mesa-vulkan-devel
       - mesa-vulkan-drivers
       - meson
@@ -2401,13 +2413,13 @@ data:
       - nss-pkcs11-devel
       - nss-sysinit
       - nss-tools
-      - nss-pem
       - nss-softokn
       - nss-softokn-devel
       - nss-softokn-freebl
       - nss-softokn-freebl-devel
       - nss-util
       - nss-util-devel
+      - nss_nis
       - numactl-libs
       - ocaml-srpm-macros
       - oniguruma
@@ -2584,13 +2596,16 @@ data:
       - python3-pyparsing
       - python2-asn1crypto
       - python2-beaker
+      - python3-beaker
       - python2-cffi
       - python2-cryptography
       - python2-enum34
       - python2-idna
       - python2-ipaddress
       - python2-mako
+      - python3-mako
       - python2-markupsafe
+      - python3-markupsafe
       - python2-paste
       - python2-pip
       - python3-pip
@@ -2659,6 +2674,7 @@ data:
       - speex-devel
       - speexdsp
       - speexdsp-devel
+      - spirv-tools-libs
       - sqlite
       - sqlite-devel
       - sqlite-libs
@@ -2670,6 +2686,8 @@ data:
       - systemd-pam
       - systemtap-sdt-devel
       - tar
+      - tcl
+      - tcl-devel
       - teckit
       - info
       - texinfo
@@ -2767,9 +2785,11 @@ data:
       - vulkan-filesystem
       - libwayland-client
       - libwayland-cursor
+      - libwayland-egl
       - libwayland-server
       - wayland-devel
       - wayland-protocols-devel
+      - webrtc-audio-processing
       - which
       - words
       - xcb-proto
diff --git a/package-notes.txt b/package-notes.txt
index 4079e4e..d3431ea 100644
--- a/package-notes.txt
+++ b/package-notes.txt
@@ -22,7 +22,6 @@ ca-certificates
 cdparanoia-libs: pulled in via gstreamer1-plugins-base
 chkconfig:
 colord-libs:
-compat-openssl10:
 coreutils-common: W: no bins/libs
 crypto-policies: W: data files
 cryptsetup-libs: FD: systemd
@@ -109,15 +108,13 @@ libusbx
 libutempter: FD: util-linux
 libverto-libev: FD: krb5-server
 libvisual
-llvm5.0-libs: W: mesa
 logrotate: FD: krb5-server
 lz4-libs: W: libarchive
-make: F: dependency of compat-openssl10
+make
 mcpp: FD: dbus-x11
 mlocate: F: this makes no sense - nobody ever is going to run updatedb
 ncurses-base
 ncurses-libs
-nss-pem: W: fedora dependency of nss
 nss-sysinit
 openldap
 openssl-libs
diff --git a/tools/resolve-files.py b/tools/resolve-files.py
index 80a4fd1..42d782b 100755
--- a/tools/resolve-files.py
+++ b/tools/resolve-files.py
@@ -213,6 +213,9 @@ pc_ignore = {
     # Not enabled on Fedora
     'harfbuzz-gobject.pc',
 
+    # Was in mesa-libwayland-egl-devel, but merged into wayland-devel in F28, move causes problems
+    'wayland-egl.pc',
+
     # https://github.com/ostroproject/ostro-os/blob/master/meta/recipes-support/libassuan/libassuan/libassuan-add-pkgconfig-support.patch
     'libassuan.pc',