GtkTextView *text_view;

 	GtkTextIter end;

 	GtkTextBuffer *buffer;

+    char *gdb = g_find_program_in_path ("gdb");

+    char *pstack = g_find_program_in_path ("pstack");

-	/* FIXME: These strings are gdb specific, we should add here also dbx */

-	const char *bt_step1 = "#1";

-	const char *bt_step2 = "#2";

-	const char *bt_step3 = "#3";

-

-	if (!g_strrstr (stacktrace, bt_step1) &&

-            !g_strrstr (stacktrace, bt_step2) &&

-            !g_strrstr (stacktrace, bt_step3)) {

-		return FALSE;

-	}

-

-

+#if defined(sun) && defined(__SVR4)

+        gdb = NULL;

+#endif /* defined(sun) && defined(__SVR4) */

+

+    if (gdb) {

+	    /* FIXME: These strings are gdb specific, we should add here also dbx */

+	    const char *bt_step1 = "#1";

+	    const char *bt_step2 = "#2";

+	    const char *bt_step3 = "#3";

+

+	    if (!g_strrstr (stacktrace, bt_step1) &&

+                !g_strrstr (stacktrace, bt_step2) &&

+                !g_strrstr (stacktrace, bt_step3)) {

+            g_free (gdb);

+            g_free (pstack);

+		    return FALSE;

+	    }

+    }

 	text_view = GTK_TEXT_VIEW (gtk_builder_get_object (ui, "gdb-text"));

 	buffer = gtk_text_view_get_buffer (text_view);

 	/* add the stacktrace to the GtkTextView */

 	gtk_text_buffer_insert (buffer, &end, stacktrace, strlen (stacktrace));

+    g_free (gdb);

+    g_free (pstack);

 	return TRUE;

 }

@@ -191,11 +191,9 @@

 	GIOChannel *ioc;

 	GError *error = NULL;

 	GdbData *gdb_data = NULL;

-	char *args[] = { "gdb",

-			 "--batch", 

-			 "--quiet",

-			 "--command=" BUDDY_DATADIR "/gdb-cmd",

-			 NULL, NULL, NULL };

+    char *args[7];

+    char *gdb = NULL;

+    char *pstack = NULL;

 	g_return_val_if_fail (app != NULL, 0);

 	g_return_val_if_fail (*app != '\0', 0);

 	d (g_print ("app=%s\n", app));

+#if defined(sun) && defined(__SVR4)

+    pstack = g_find_program_in_path ("pstack");

+    if (pstack) {

+        args[0] = pstack;

+    } else {

+        gdb = g_find_program_in_path ("gdb");

+        args[0] = gdb;

+        args[1] = "--batch";

+        args[2] = "--quiet";

+        args[3] = "--command=" BUDDY_DATADIR "/gdb-cmd";

+    }

+#else

+    gdb = g_find_program_in_path ("gdb");

+    args[0] = gdb;

+    args[1] = "--batch";

+    args[2] = "--quiet";

+    args[3] = "--command=" BUDDY_DATADIR "/gdb-cmd";

+#endif /* defined(sun) && defined(__SVR4) */

+

 	/* apply a SIGCONT to the process */

 	kill (pid, SIGCONT);

 	if (!long_app) {

 		g_set_error (err, GDB_BUDDY_ERROR, GDB_BUDDY_BINARY_NOT_FOUND, 

 		             _("The binary file could not be found. Try using an absolute path."));

 		return 0;

 	}

-	args[0] = g_find_program_in_path ("gdb");

-	args[4] = long_app;

+    if (!pstack)

+        args[4] = long_app;

 	if (args[0] == NULL) {

 		d(g_message ("Path: %s", getenv ("PATH")));

 		g_free (long_app);

 		g_set_error (err, GDB_BUDDY_ERROR, GDB_BUDDY_GDB_NOT_FOUND, 

-			     _("GDB could not be found on your system. "

-			       "Debugging information will not be obtained."));

+			     _("%s could not be found on your system. "

+			       "Debugging information will not be obtained."),

+                    pstack != NULL ? "pstack" : "gdb");

 		return 0;

 	} 

 	d(g_message ("About to debug '%s'", long_app));

-	if (!g_file_test (BUDDY_DATADIR "/gdb-cmd", G_FILE_TEST_EXISTS)) {

-		g_set_error (err, GDB_BUDDY_ERROR, GDB_BUDDY_GDB_CMD_NOT_FOUND, 

-			     _("Could not find the gdb-cmd file.\n"

-			       "Please try reinstalling Bug Buddy."));

-		g_free (args[0]);

-		g_free (long_app);

-		return 0;

-	}

+    if (gdb) {

+	    if (!g_file_test (BUDDY_DATADIR "/gdb-cmd", G_FILE_TEST_EXISTS)) {

+		    g_set_error (err, GDB_BUDDY_ERROR, GDB_BUDDY_GDB_CMD_NOT_FOUND, 

+			        _("Could not find the gdb-cmd file.\n"

+			        "Please try reinstalling Bug Buddy."));

+		    g_free (long_app);

+		    return 0;

+	    }

+    }

-	args[5] = g_strdup_printf ("%d", pid);

+    if (pstack) 

+	    args[1] = g_strdup_printf ("%d", pid);

+    else

+	    args[5] = g_strdup_printf ("%d", pid);

 	if (!g_spawn_async_with_pipes (NULL, args, NULL, 0, NULL, NULL,

 				       &gdb_pid,

 			     _("There was an error running gdb:\n\n%s"),

 			     error->message);

 		g_error_free (error);

-		g_free (args[0]);

-		g_free (args[5]);

+        if (pstack)

+		    g_free (args[1]);

+        else

+		    g_free (args[5]);

 		g_free (long_app);

 		return 0;

 	} 

 	                                 gdb_handle_input, gdb_data, gdb_destroy);

 	g_io_channel_unref (ioc);

-	g_free (args[0]);

-	g_free (args[5]);

+    if (pstack)

+	    g_free (args[1]);

+    else

+	    g_free (args[5]);

 	g_free (long_app);

 	return source_id;