diff --git a/ChangeLog b/ChangeLog
index 66c4ef574..4a0301cc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@
      the read-syscall and wait forever for systrace-answers) by replacing
      the read/write synchronisation with SIGSTOP/SIGCONT;
      report and help hshoexer@; ok djm@, dtucker@
+   - dtucker@cvs.openbsd.org 2012/07/02 08:50:03
+     [ssh.c]
+     set interactive ToS for forwarded X11 sessions.  ok djm@
 
 20120629
  - OpenBSD CVS Sync
diff --git a/ssh.c b/ssh.c
index 68e131527..3c376d0ff 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.368 2011/10/24 02:10:46 djm Exp $ */
+/* $OpenBSD: ssh.c,v 1.369 2012/07/02 08:50:03 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1359,6 +1359,10 @@ ssh_session2_setup(int id, int success, void *arg)
 		packet_send();
 	}
 
+	/* Tell the packet module whether this is an interactive session. */
+	packet_set_interactive(interactive,
+	    options.ip_qos_interactive, options.ip_qos_bulk);
+
 	client_session2_setup(id, tty_flag, subsystem_flag, getenv("TERM"),
 	    NULL, fileno(stdin), &command, environ);
 }