diff --git a/list-common.sh b/list-common.sh
index 555ca4b..e48110e 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -52,6 +52,7 @@ buildignore sane-backends
 
 install branding-openSUSE
 install gfxboot  i686,x86_64
+install shim x86_64
 
 # Don't pull in any -32bit libs
 buildignore glibc-32bit
@@ -288,4 +289,3 @@ install zip
 
 # Workaround for bsc#1131492
 buildignore ntp
-
diff --git a/list-gnome.sh b/list-gnome.sh
index 4020e6c..85d14e2 100644
--- a/list-gnome.sh
+++ b/list-gnome.sh
@@ -34,6 +34,7 @@ buildignore simple-scan
 
 buildignore ghostscript
 buildignore myspell-en_US
+buildignore orca
 
 # Pulls in color management tools
 buildignore gnome-control-center-color
@@ -43,6 +44,7 @@ buildignore libgweather-lang
 buildignore gnome-user-docs
 buildignore gnome-user-docs-lang
 buildignore evolution-lang
+buildignore evolution-data-server-lang
 buildignore zenity-lang
 
 # Pulls in clamav
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index 89111b2..bef0397 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -464,6 +465,8 @@
     <ignore name="ghostscript"/>
     <package name="aaa_base" replaces="myspell-en_US"/>
     <ignore name="myspell-en_US"/>
+    <package name="aaa_base" replaces="orca"/>
+    <ignore name="orca"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
     <ignore name="gnome-control-center-color"/>
     <package name="aaa_base" replaces="libgweather-lang"/>
@@ -474,6 +477,8 @@
     <ignore name="gnome-user-docs-lang"/>
     <package name="aaa_base" replaces="evolution-lang"/>
     <ignore name="evolution-lang"/>
+    <package name="aaa_base" replaces="evolution-data-server-lang"/>
+    <ignore name="evolution-data-server-lang"/>
     <package name="aaa_base" replaces="zenity-lang"/>
     <ignore name="zenity-lang"/>
     <package name="aaa_base" replaces="amavisd-new"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 43ad593..a51ed5f 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index af2e822..9ae9cb1 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 436d589..3f5e322 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Sep 16 06:52:25 UTC 2019 - Fabian Vogt <fvogt@suse.com>
+
+- list-common: Add shim for x86_64 explicitly
+
+-------------------------------------------------------------------
+Thu Sep 12 09:52:37 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Ignore evolution-data-server-lang on the GNOME live media.
+
+-------------------------------------------------------------------
+Thu Sep 12 07:53:13 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Drop orca again from the GNOME Live - we are really above the
+  space limits with it - or we find something else to drop.
+
 -------------------------------------------------------------------
 Mon Sep  2 13:23:00 UTC 2019 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 61500ae..7424747 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
@@ -464,6 +465,8 @@
     <ignore name="ghostscript"/>
     <package name="aaa_base" replaces="myspell-en_US"/>
     <ignore name="myspell-en_US"/>
+    <package name="aaa_base" replaces="orca"/>
+    <ignore name="orca"/>
     <package name="aaa_base" replaces="gnome-control-center-color"/>
     <ignore name="gnome-control-center-color"/>
     <package name="aaa_base" replaces="libgweather-lang"/>
@@ -474,6 +477,8 @@
     <ignore name="gnome-user-docs-lang"/>
     <package name="aaa_base" replaces="evolution-lang"/>
     <ignore name="evolution-lang"/>
+    <package name="aaa_base" replaces="evolution-data-server-lang"/>
+    <ignore name="evolution-data-server-lang"/>
     <package name="aaa_base" replaces="zenity-lang"/>
     <ignore name="zenity-lang"/>
     <package name="aaa_base" replaces="amavisd-new"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 97f848a..fbc230d 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 66af371..3c69c95 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 72a5c7e..2db638f 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -157,6 +157,7 @@
     <ignore name="sane-backends"/>
     <package name="branding-openSUSE"/>
     <package name="gfxboot" arch="i686,x86_64"/>
+    <package name="shim" arch="x86_64"/>
     <package name="aaa_base" replaces="glibc-32bit"/>
     <ignore name="glibc-32bit"/>
     <package name="aaa_base" replaces="libvdpau_r300"/>