diff --git a/games-fps/openarena/files/oa_ded b/games-fps/openarena/files/oa_ded
new file mode 100644
index 0000000..e152dd8
--- /dev/null
+++ b/games-fps/openarena/files/oa_ded
@@ -0,0 +1,9 @@
+#!/bin/sh
+CVARS="+set com_basegame baseoa"
+CVARS="$CVARS +set fs_basepath /usr/lib64/openarena"
+CVARS="$CVARS +set com_homepath OpenArena"
+CVARS="$CVARS +set com_legacyprotocol 71"
+CVARS="$CVARS +set com_protocol 71"
+CVARS="$CVARS +set sv_master1 dpmaster.deathmask.net"
+CVARS="$CVARS +set cl_motd 0"
+ioq3ded ${CVARS} "$@"
diff --git a/games-fps/openarena/files/openarena b/games-fps/openarena/files/openarena
new file mode 100644
index 0000000..9f40283
--- /dev/null
+++ b/games-fps/openarena/files/openarena
@@ -0,0 +1,9 @@
+#!/bin/sh
+CVARS="+set com_basegame baseoa"
+CVARS="$CVARS +set fs_basepath /usr/lib64/openarena"
+CVARS="$CVARS +set com_homepath OpenArena"
+CVARS="$CVARS +set com_legacyprotocol 71"
+CVARS="$CVARS +set com_protocol 71"
+CVARS="$CVARS +set sv_master1 dpmaster.deathmask.net"
+CVARS="$CVARS +set cl_motd 0"
+ioquake3 ${CVARS} "$@"
diff --git a/games-fps/openarena/openarena-0.8.8.ebuild b/games-fps/openarena/openarena-0.8.8.ebuild
index 536edcd..868493d 100644
--- a/games-fps/openarena/openarena-0.8.8.ebuild
+++ b/games-fps/openarena/openarena-0.8.8.ebuild
@@ -17,20 +17,8 @@ DEPEND="
 RDEPEND="${DEPEND}"
 RESTRICT="mirror"
 
-src_compile() {
-	einfo "Creating wrapper script..."
-	cat <<EOF >>${S}/openarena
-#!/bin/sh
-CVARS="+set com_basegame baseoa"
-CVARS="\$CVARS +set fs_basepath ${EPREFIX}/usr/$(get_libdir)/${PN}"
-CVARS="\$CVARS +set com_homepath .openarena"
-CVARS="\$CVARS +set com_legacyprotocol 71"
-CVARS="\$CVARS +set com_protocol 71"
-CVARS="\$CVARS +set sv_master1 dpmaster.deathmask.net"
-CVARS="\$CVARS +set cl_motd 0"
-exec "${EPREFIX}/usr/$(get_libdir)/ioquake3/ioquake3" \${CVARS} "\$@"
-EOF
-}
+IUSE="+client +server"
+
 src_install() {
 	insinto "/usr/$(get_libdir)/${PN}"
 	doins -r baseoa
@@ -38,6 +26,7 @@ src_install() {
 	dodoc CHANGES
 	dodoc CREDITS
 	dodoc README
-	dobin openarena
+	use client && dobin "${FILESDIR}/openarena"
+	use server && dobin "${FILESDIR}/oa_ded"
 	make_desktop_entry "${PN} %U" "OpenArena" "${PN}" "Game;ActionGame"
 }