diff --git a/net-p2p/monero-gui-bin/Manifest b/net-p2p/monero-gui-bin/Manifest
index 97a8fdd1dd..cf7b8d3050 100644
--- a/net-p2p/monero-gui-bin/Manifest
+++ b/net-p2p/monero-gui-bin/Manifest
@@ -1 +1 @@
-DIST monero-gui-bin-0.18.3.4.tar.bz2 131624926 BLAKE2B cdfee621b44aa4e7f358b8eeca1fcc9244465729097c9d7f8e81cd522f5f899a96fb3c9c6c086f8bf2687f80a4b708bac618acae7773d8aaecb362746e05974e SHA512 0ad531d592b325b82582c7a2c4f4982165f3ad0f4d860e58c54635aaf71516d75a3318b710b35e816fa6c08b7b1e6d82135d6e1f8dba4f3ca6436a3db5c65d3a
+DIST monero-gui-bin-0.18.4.0.tar.bz2 130240801 BLAKE2B d71b4f42389ee17d6f0a182331bf67d93308a22eb1e5dc52c142383d7b2eadeb91a47772f902f93777814baf6720c8bd39df07d67fc06760fd3d456ea652a9d4 SHA512 54c037402c6ca330a8da49eb9f5fb9a027e8fccbd9a9585e3ce94a97a6585755d5c1ab59933d04d4f45f76f6f9d59c5f6780c6b428fe3bccc1148f88918d564f
diff --git a/net-p2p/monero-gui-bin/monero-gui-bin-0.18.3.4-r1.ebuild b/net-p2p/monero-gui-bin/monero-gui-bin-0.18.4.0.ebuild
similarity index 95%
rename from net-p2p/monero-gui-bin/monero-gui-bin-0.18.3.4-r1.ebuild
rename to net-p2p/monero-gui-bin/monero-gui-bin-0.18.4.0.ebuild
index bf36bf04d9..90d463ab1d 100644
--- a/net-p2p/monero-gui-bin/monero-gui-bin-0.18.3.4-r1.ebuild
+++ b/net-p2p/monero-gui-bin/monero-gui-bin-0.18.4.0.ebuild
@@ -32,10 +32,13 @@ QA_PREBUILT="*"
 
 src_install() {
 	insinto /usr/bin
+
 	doins monero-wallet-gui
+	fperms +x /usr/bin/monero-wallet-gui
 
 	if use daemon ; then
 		doins monerod
+		fperms +x /usr/bin/monerod
 	fi
 
 	if use tools ; then
@@ -50,30 +53,6 @@ src_install() {
 		doins extras/monero-blockchain-usage
 		doins extras/monero-gen-ssl-cert
 		doins extras/monero-gen-trusted-multisig
-	fi
-
-	if use wallet-cli ; then
-		doins extras/monero-wallet-cli
-	fi
-
-	if use wallet-rpc ; then
-		doins extras/monero-wallet-rpc
-	fi
-
-	domenu "${FILESDIR}"/monero-gui.desktop
-
-	local x
-	for x in 16 24 32 48 64 96 128 256; do
-		newicon -s ${x} "${FILESDIR}"/${x}x${x}.png monero-gui.png
-	done
-
-	fperms +x /usr/bin/monero-wallet-gui
-
-	if use daemon ; then
-		fperms +x /usr/bin/monerod
-	fi
-
-	if use tools ; then
 		fperms +x /usr/bin/monero-blockchain-ancestry
 		fperms +x /usr/bin/monero-blockchain-depth
 		fperms +x /usr/bin/monero-blockchain-export
@@ -88,10 +67,20 @@ src_install() {
 	fi
 
 	if use wallet-cli ; then
+		doins extras/monero-wallet-cli
+
 		fperms +x /usr/bin/monero-wallet-cli
 	fi
 
 	if use wallet-rpc ; then
+		doins extras/monero-wallet-rpc
 		fperms +x /usr/bin/monero-wallet-rpc
 	fi
+
+	domenu "${FILESDIR}"/monero-gui.desktop
+
+	local x
+	for x in 16 24 32 48 64 96 128 256; do
+		newicon -s ${x} "${FILESDIR}"/${x}x${x}.png monero-gui.png
+	done
 }