diff --git a/conf/intel/portage/package.mask/00-sabayon.package.mask b/conf/intel/portage/package.mask/00-sabayon.package.mask
index 0712f1cb..ac621eaf 100644
--- a/conf/intel/portage/package.mask/00-sabayon.package.mask
+++ b/conf/intel/portage/package.mask/00-sabayon.package.mask
@@ -258,5 +258,9 @@ virtual/linux-sources::gentoo
 # 2018-03-02 Sławomir Nizio: required by sys-admin/anaconda::sabayon-distro
 >=sys-process/audit-2.7
 
+# 2018-04-24 Sławomir Nizio: net-misc/gerbera-1.1.0-r1 has
+# <=net-libs/libupnp-1.8.2:1.8, related Gentoo bug 654014
+>=net-libs/libupnp-1.8.2:1.8
+
 # Temp mask
 dev-lang/python:3.6