diff --git a/Makefile b/Makefile
index 741f48b..4f788cc 100644
--- a/Makefile
+++ b/Makefile
@@ -233,6 +233,7 @@ install-common: install-doc
 	install -m 0755 misc/qvm-features-request $(DESTDIR)$(BINDIR)/qvm-features-request
 	install -m 0755 misc/qubes-run-terminal $(DESTDIR)/$(BINDIR)
 	install -D -m 0644 misc/qubes-run-terminal.desktop $(DESTDIR)/$(APPLICATIONSDIR)/qubes-run-terminal.desktop
+	install -m 0755 misc/qubes-run-gnome-terminal $(DESTDIR)/$(BINDIR)
 
 	install -D -m 0644 misc/dconf-db-local-dpi $(DESTDIR)/etc/dconf/db/local.d/dpi
 
@@ -245,7 +246,7 @@ install-common: install-doc
 
 	install -D -m 0644 misc/marker-vm $(DESTDIR)/usr/share/qubes/marker-vm
 	cut -f 1,2 -d . version >> $(DESTDIR)/usr/share/qubes/marker-vm
-	
+
 	install -m 0755 misc/tinyproxy-wrapper $(DESTDIR)/usr/lib/qubes/tinyproxy-wrapper
 
 	install -m 0755 misc/qvm-console $(DESTDIR)$(BINDIR)/qvm-console
diff --git a/debian/qubes-core-agent.install b/debian/qubes-core-agent.install
index c952819..397c131 100644
--- a/debian/qubes-core-agent.install
+++ b/debian/qubes-core-agent.install
@@ -97,6 +97,7 @@ usr/bin/qubes-desktop-run
 usr/bin/qubes-open
 usr/bin/qubes-session-autostart
 usr/bin/qubes-run-terminal
+usr/bin/qubes-run-gnome-terminal
 usr/bin/qubes-vmexec
 usr/bin/qvm-copy
 usr/bin/qvm-copy-to-vm
diff --git a/misc/qubes-run-gnome-terminal b/misc/qubes-run-gnome-terminal
new file mode 100755
index 0000000..44b448f
--- /dev/null
+++ b/misc/qubes-run-gnome-terminal
@@ -0,0 +1,12 @@
+#!/bin/sh
+# Wrapper around gnome-terminal that runs it with --wait option
+# (if supoported).
+
+# Check if our gnome-terminal version supports --wait
+# (we can't just run it and check exit code, because if it works, it will
+# return the exit code of the child process)
+if gnome-terminal --help-terminal-options | grep --silent -- --wait; then
+    exec gnome-terminal --wait "$@"
+else
+    exec gnome-terminal "$@"
+fi
diff --git a/misc/qubes-run-terminal b/misc/qubes-run-terminal
index c12d8ff..a7b5c44 100755
--- a/misc/qubes-run-terminal
+++ b/misc/qubes-run-terminal
@@ -12,14 +12,7 @@ if is_command x-terminal-emulator; then
 fi
 
 if is_command gnome-terminal; then
-    # Check if our gnome-terminal version supports --wait
-    # (we can't just run it and check exit code, because if it works, it will
-    # return the exit code of the child process)
-    if gnome-terminal --help-terminal-options | grep --silent -- --wait; then
-        exec gnome-terminal --wait
-    else
-        exec gnome-terminal
-    fi
+    exec qubes-run-gnome-terminal
 fi
 
 for terminal in xfce4-terminal konsole urxvt rxvt termit terminator Eterm aterm roxterm termite lxterminal mate-terminal terminology st xterm; do
diff --git a/rpm_spec/core-agent.spec.in b/rpm_spec/core-agent.spec.in
index b33f3a2..2b264d8 100644
--- a/rpm_spec/core-agent.spec.in
+++ b/rpm_spec/core-agent.spec.in
@@ -615,6 +615,7 @@ rm -f %{name}-%{version}
 /usr/bin/xenstore-watch-qubes
 /usr/bin/qubes-desktop-run
 /usr/bin/qubes-run-terminal
+/usr/bin/qubes-run-gnome-terminal
 /usr/bin/qubes-open
 /usr/bin/qubes-session-autostart
 /usr/bin/qvm-console