diff --git a/sys-process/audit/audit-2.4.1.ebuild b/sys-process/audit/audit-2.4.1-r1.ebuild
similarity index 85%
rename from sys-process/audit/audit-2.4.1.ebuild
rename to sys-process/audit/audit-2.4.1-r1.ebuild
index 4b2599c..0444a61 100644
--- a/sys-process/audit/audit-2.4.1.ebuild
+++ b/sys-process/audit/audit-2.4.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.4.1-r1.ebuild,v 1.1 2015/05/16 05:56:03 robbat2 Exp $
 
 EAPI="5"
 
@@ -25,10 +25,13 @@ RDEPEND="apparmor? ( sys-apps/apparmor )
 	tcpd? ( sys-apps/tcp-wrappers )
 	sys-libs/libcap-ng"
 DEPEND="${RDEPEND}
-	python? ( dev-lang/swig )
+	python? ( ${PYTHON_DEPS}
+		dev-lang/swig )
 	>=sys-kernel/linux-headers-2.6.34"
 # Do not use os-headers as this is linux specific
 
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
 CONFIG_CHECK="~AUDIT"
 
 pkg_setup() {
@@ -36,6 +39,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# Do not build GUI tools
+	sed -i \
+		-e '/AC_CONFIG_SUBDIRS.*system-config-audit/d' \
+		"${S}"/configure.ac || die
+	sed -i \
+		-e 's,system-config-audit,,g' \
+		"${S}"/Makefile.am || die
+	rm -rf "${S}"/system-config-audit
+
 	if ! use ldap; then
 		sed -i \
 			-e '/^AC_OUTPUT/s,audisp/plugins/zos-remote/Makefile,,g' \
@@ -46,7 +58,7 @@ src_prepare() {
 	fi
 
 	# Don't build static version of Python module.
-	epatch "${FILESDIR}"/${P}-python.patch
+	epatch "${FILESDIR}"/${PN}-2.4.1-python.patch
 
 	# glibc/kernel upstreams suck with both defining ia64_fpreg
 	# This patch is a horribly workaround that is only valid as long as you
@@ -67,6 +79,7 @@ src_prepare() {
 
 multilib_src_configure() {
 	local ECONF_SOURCE=${S}
+	#append-flags -D'__attribute__(x)='
 	econf \
 		--sbindir=/sbin \
 		--enable-systemd \
@@ -162,8 +175,15 @@ multilib_src_install_all() {
 	prune_libtool_files --modules
 }
 
+pkg_preinst() {
+	# Preserve from the audit-1 series
+	preserve_old_lib /$(get_libdir)/libaudit.so.0
+}
+
 pkg_postinst() {
 	lockdown_perms "${ROOT}"
+	# Preserve from the audit-1 series
+	preserve_old_lib_notify /$(get_libdir)/libaudit.so.0
 }
 
 lockdown_perms() {