diff --git a/make.conf.template b/make.conf.template
index 1e3cb01..ac3ada8 100644
--- a/make.conf.template
+++ b/make.conf.template
@@ -65,4 +65,4 @@ RUBY_TARGETS="ruby21"
 SANE_BACKENDS="mustek_usb2"
 APACHE2_MPMS="worker"
 SUEXEC_DOCROOT="/home/www"
-GRUB_PLATFORMS="emu efi-32 efi-64 pc"
+GRUB_PLATFORMS="emu efi-32 efi-64 pc xen xen-32"
diff --git a/package.env/all b/package.env/all
index bcd1fef..15f370e 100644
--- a/package.env/all
+++ b/package.env/all
@@ -5,6 +5,7 @@ app-text/acroread aslang
 app-text/ghostscript-gpl aslang
 app-text/hunspell eulang
 mail-client/thunderbird-bin aslang
+mail-filter/razor noparallelmake
 media-fonts/acroread-asianfonts aslang
 media-gfx/darktable p4cpu
 media-gfx/rawtherapee o3
diff --git a/package.keywords/all b/package.keywords/all
index 4d0beb0..9bee93a 100644
--- a/package.keywords/all
+++ b/package.keywords/all
@@ -18,6 +18,7 @@ dev-embedded/picasm ~x86 ~amd64
 dev-embedded/picp ~x86 ~amd64
 dev-embedded/pk2cmd ~x86 ~amd64
 =dev-lang/php-4.4.9 ~x86 ~amd64
+=dev-libs/libclc-0.2.0_pre20160921 ~x86 ~amd64
 dev-libs/opencryptoki ~x86 ~amd64
 dev-perl/ZMQ-LibZMQ3 ~x86 ~amd64
 dev-perl/pcsc-perl ~x86 ~amd64
diff --git a/package.mask/all b/package.mask/all
index debf069..4df6f47 100644
--- a/package.mask/all
+++ b/package.mask/all
@@ -1,7 +1,10 @@
+>app-admin/puppet-4
 >app-admin/syslog-ng-3.6
 >dev-lang/php-7
 >dev-perl/Net-DNS-0.740.0
+>=dev-python/jinja-2.9
 >dev-ruby/facter-3
+>dev-ruby/hiera-3
 media-libs/libjpeg-turbo
 >=net-libs/zeromq-4
->=sys-boot/grub-2
+>=sys-apps/openrc-0.24
diff --git a/package.use/all b/package.use/all
index 7eeee64..7e9a0ae 100644
--- a/package.use/all
+++ b/package.use/all
@@ -24,6 +24,7 @@ app-text/calibre -udisks
 app-text/ghostscript-gpl -X -gtk cups
 app-text/gocr -tk
 app-text/poppler qt4
+app-text/xmlto text
 dev-db/mariadb -perl -xml
 dev-db/mysql -perl
 dev-db/postgresql threads -perl -tcl
@@ -197,7 +198,7 @@ sys-apps/parted device-mapper
 sys-apps/util-linux -perl static-libs tty-helpers fdformat
 sys-apps/xinetd -perl
 sys-block/parted device-mapper
-sys-boot/grub netboot
+sys-boot/grub netboot device-mapper efiemu -fonts -sdl -themes -truetype
 sys-devel/gcc -gtk gcj
 sys-devel/gettext -java
 sys-fs/cryptsetup dynamic