diff --git a/paludis/bashrc b/paludis/bashrc
index 7b283c1..f34d3d2 100644
--- a/paludis/bashrc
+++ b/paludis/bashrc
@@ -46,7 +46,8 @@ if [[
 	"${CATEGORY}/${PN}" != "games-engines/OpenJK"
 	]]
 then
-	. /etc/paludis/env.conf.d/O3.conf
+	CFLAGS="${CFLAGS} -O3"
+	CXXFLAGS="${CXXFLAGS} -O3"
 fi
 
 [[ -e /etc/paludis/hooks/setup_pkg_env.bash ]] && . /etc/paludis/hooks/setup_pkg_env.bash
diff --git a/paludis/keywords.conf.d/desktop.conf b/paludis/keywords.conf.d/desktop.conf
index d3ae7eb..441322c 100644
--- a/paludis/keywords.conf.d/desktop.conf
+++ b/paludis/keywords.conf.d/desktop.conf
@@ -130,3 +130,4 @@ dev-python/python-sipsimple ~amd64
 dev-python/python-msrplib ~amd64
 dev-python/python-xcaplib ~amd64
 dev-python/python-eventlib ~amd64
+dev-python/python-gnutls ~amd64
diff --git a/paludis/package_unmask.conf b/paludis/package_unmask.conf
index e1ed820..371f9bb 100644
--- a/paludis/package_unmask.conf
+++ b/paludis/package_unmask.conf
@@ -103,3 +103,4 @@ dev-python/python-sipsimple::k_f
 dev-python/python-msrplib::k_f
 dev-python/python-xcaplib::k_f
 dev-python/python-eventlib::k_f
+dev-python/python-gnutls::k_f