diff --git a/bitcoin-qt_wrapper.sh b/bitcoin-qt_wrapper.sh
deleted file mode 100644
index 18f454e..0000000
--- a/bitcoin-qt_wrapper.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-
-exec bitcoin-qt -datadir="${XDG_DATA_HOME}" "$@"
diff --git a/install_wrappers.sh b/install_wrappers.sh
new file mode 100644
index 0000000..eeadd73
--- /dev/null
+++ b/install_wrappers.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/bash
+
+for b in bitcoin{d,-qt,-cli}
+do
+  echo '#!/usr/bin/bash' > /app/bin/$b
+  echo "exec /app/bin/internal/$b" '-datadir="${XDG_DATA_HOME}" "$@"' >> /app/bin/$b
+  chmod 744 /app/bin/$b
+done
diff --git a/org.bitcoincore.bitcoin-qt.desktop b/org.bitcoincore.bitcoin-qt.desktop
index e3a3fa5..c65de2d 100755
--- a/org.bitcoincore.bitcoin-qt.desktop
+++ b/org.bitcoincore.bitcoin-qt.desktop
@@ -4,7 +4,7 @@ Comment=Connect to the Bitcoin P2P Network
 Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
 Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
 Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
-Exec=bitcoin-qt_wrapper.sh %u
+Exec=bitcoin-qt %u
 Terminal=false
 Type=Application
 Icon=org.bitcoincore.bitcoin-qt
diff --git a/org.bitcoincore.bitcoin-qt.json b/org.bitcoincore.bitcoin-qt.json
index 1508927..358f112 100644
--- a/org.bitcoincore.bitcoin-qt.json
+++ b/org.bitcoincore.bitcoin-qt.json
@@ -3,7 +3,7 @@
     "runtime": "org.freedesktop.Platform",
     "sdk": "org.freedesktop.Sdk",
     "runtime-version": "18.08",
-    "command": "bitcoin-qt_wrapper.sh",
+    "command": "bitcoin-qt",
     "finish-args": [
 	/* Wayland and Xorg support */
 	"--socket=x11",
@@ -22,13 +22,13 @@
 	    "name": "bitcoin-core",
 	    "buildsystem": "simple",
 	    "build-commands": [
-		"install -m 0744 -D -t /app/bin bin/bitcoind",
-		"install -m 0744 -D -t /app/bin bin/bitcoin-qt",
-		"install -m 0744 -D -t /app/bin bin/bitcoin-cli",
-		"install -m 0744 -D -t /app/bin bin/test_bitcoin"
+		"install -m 0744 -D -t /app/bin/internal bin/bitcoind",
+		"install -m 0744 -D -t /app/bin/internal bin/bitcoin-qt",
+		"install -m 0744 -D -t /app/bin/internal bin/bitcoin-cli",
+		"install -m 0744 -D -t /app/bin/internal bin/test_bitcoin"
 	    ],
 	    "post-install": [
-		"/app/bin/test_bitcoin"
+		"/app/bin/internal/test_bitcoin"
 	    ],
 	    "sources": [
 		{
@@ -65,7 +65,7 @@
 		"install -Dp -m 644 org.bitcoincore.bitcoin-qt.desktop /app/share/applications/org.bitcoincore.bitcoin-qt.desktop",
 		"install -Dp -m 644 bitcoin.svg /app/share/icons/hicolor/scalable/apps/org.bitcoincore.bitcoin-qt.svg",
 		"install -Dp -m 644 org.bitcoincore.bitcoin-qt.appdata.xml /app/share/metainfo/org.bitcoincore.bitcoin-qt.appdata.xml",
-		"install -Dp -m 744 bitcoin-qt_wrapper.sh /app/bin/bitcoin-qt_wrapper.sh"
+		"bash install_wrappers.sh"
 
 	    ],
 	    "sources": [
@@ -84,7 +84,7 @@
 		},
 		{
 		    "type": "file",
-		    "path": "bitcoin-qt_wrapper.sh"
+		    "path": "install_wrappers.sh"
 		}
 
 	    ]