diff --git a/net-misc/wireshark-sap-plugin/Manifest b/net-misc/wireshark-sap-plugin/Manifest
index 4a098bb4f..40e0ed19a 100644
--- a/net-misc/wireshark-sap-plugin/Manifest
+++ b/net-misc/wireshark-sap-plugin/Manifest
@@ -1 +1,2 @@
 DIST wireshark-sap-plugin-0.2.2.tar.gz 138534 SHA256 b4803e907452158d0872551389e5b9af2a63c34576a36fdb99670ed35c667c51 SHA512 0ae4a88c059f9bb8877ef02acdde3306bd34dbc325cd939de238c91b2c40acd408bc003ce812ec83716a05c7e4ecebd11c76ae7cd8a91552bf9aa11093c6be2a WHIRLPOOL d37a9dc3f802e05709e3ce6340e1df10dece479743120ef422083e381fcd9942c3b73f5fec402c3b6ad6d82b9cf81bbf2df5be2ec2ee62a3e5fca4de1b76480c
+DIST wireshark-sap-plugin-0.2.3.tar.gz 139850 SHA256 0f016ac250df0ec2b9d6b53f070c3d6ed5dc4ef55c041fd015b4f72329a59ec5 SHA512 7f4207ebff97311cc3948a4482a1352e95900c0e65f91dbaa79b445b3dcbd57a4bbff0df4422ea218d0df0dd8d8b68cf8910cf17e7af576be793277bd879c1d9 WHIRLPOOL b78544a44cdbc6ccf92fb9b443ce089c4cb252ccf66c4b1e7fbb4c4df4f2b2435d076a41e0a9df18c3e9a86fe85eb0dc9a82afddd603656bbed1787003f71dcf
diff --git a/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.2.ebuild b/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.2.ebuild
index 7e287c04e..294ad4e02 100644
--- a/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.2.ebuild
+++ b/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv Exp $
+# $Id$
 
 EAPI=5
 
 inherit cmake-utils eutils multilib
 
-DESCRIPTION="Wireshark plugin provides dissection on SAP's NI, Message Server, Router, Diag and Enqueue protocols"
+DESCRIPTION="Wireshark plugin for SAP's protocols"
 HOMEPAGE="https://github.com/CoreSecurity/SAP-Dissection-plug-in-for-Wireshark"
-SRC_URI="https://github.com/CoreSecurity/SAP-Dissection-plug-in-for-Wireshark/archive/v0.2.2.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/CoreSecurity/SAP-Dissection-plug-in-for-Wireshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-9999.ebuild b/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.3.ebuild
similarity index 63%
rename from net-misc/wireshark-sap-plugin/wireshark-sap-plugin-9999.ebuild
rename to net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.3.ebuild
index 5eb0b681a..294ad4e02 100644
--- a/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-9999.ebuild
+++ b/net-misc/wireshark-sap-plugin/wireshark-sap-plugin-0.2.3.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: blshkv Exp $
+# $Id$
 
 EAPI=5
 
-inherit cmake-utils eutils multilib git-r3
+inherit cmake-utils eutils multilib
 
-DESCRIPTION="Wireshark plugin provides dissection on SAP's NI, Message Server, Router, Diag and Enqueue protocols"
+DESCRIPTION="Wireshark plugin for SAP's protocols"
 HOMEPAGE="https://github.com/CoreSecurity/SAP-Dissection-plug-in-for-Wireshark"
-EGIT_REPO_URI="https://github.com/CoreSecurity/SAP-Dissection-plug-in-for-Wireshark.git"
-EGIT_BRANCH="standalone"
+SRC_URI="https://github.com/CoreSecurity/SAP-Dissection-plug-in-for-Wireshark/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS=" ~amd64 ~arm ~x86"
 
 RDEPEND="net-analyzer/wireshark:="
 DEPEND="${RDEPEND}"
 
+S="${WORKDIR}/SAP-Dissection-plug-in-for-Wireshark-${PV}"
+
 get_PV() { local pv=$(best_version $1); pv=${pv#$1-}; pv=${pv%-r*}; pv=${pv//_}; echo ${pv}; }
 
 src_configure() {