Index: uspace/lib/gui/terminal.c
===================================================================
--- uspace/lib/gui/terminal.c	(revision 61b5b73da4751fa87cc6b1c1d81fe4796bc905e1)
+++ uspace/lib/gui/terminal.c	(revision c3bdc92b7c629f37d91f63d176952373c92dc7c1)
@@ -104,14 +104,6 @@
 static void getterm(const char *svc, const char *app)
 {
-	char term[LOC_NAME_MAXLEN];
-	snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc);
-	
-	/* Wait for the terminal service to be ready */
-	service_id_t service_id;
-	int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING);
-	if (rc != EOK)
-		return;
-	
-	task_spawnl(NULL, APP_GETTERM, APP_GETTERM, "-w", term, app, NULL);
+	task_spawnl(NULL, APP_GETTERM, APP_GETTERM, svc, LOCFS_MOUNT_POINT,
+	    "--msg", "--wait", "--", app, NULL);
 }