diff --git a/CHANGES b/CHANGES
index 6f8363b520..11981278f8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+2043.	[port]		nsupdate/nslookup: Force the flushing of the prompt
+			for interactive sessions. [RT#16148]
+
 2042.	[bug]		named-checkconf was incorrectly rejecting the
 			logging category "config". [RT #16117]
 
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index d4fb87d923..2685b7cadc 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.111 2005/08/25 00:40:50 marka Exp $ */
+/* $Id: nslookup.c,v 1.112 2006/06/09 07:26:42 marka Exp $ */
 
 #include <config.h>
 
@@ -715,6 +715,7 @@ get_next_command(void) {
 	if (buf == NULL)
 		fatal("memory allocation failure");
 	fputs("> ", stderr);
+	fflush(stderr);
 	isc_app_block();
 	ptr = fgets(buf, COMMSIZE, stdin);
 	isc_app_unblock();
diff --git a/bin/nsupdate/nsupdate.c b/bin/nsupdate/nsupdate.c
index f55bc6fc1a..99ac4b83b0 100644
--- a/bin/nsupdate/nsupdate.c
+++ b/bin/nsupdate/nsupdate.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nsupdate.c,v 1.143 2006/03/02 01:57:20 marka Exp $ */
+/* $Id: nsupdate.c,v 1.144 2006/06/09 07:26:42 marka Exp $ */
 
 /*! \file */
 
@@ -1499,8 +1499,10 @@ get_next_command(void) {
 	char *word;
 
 	ddebug("get_next_command()");
-	if (interactive)
+	if (interactive) {
 		fprintf(stdout, "> ");
+		fflush(stdout);
+	}
 	isc_app_block();
 	cmdline = fgets(cmdlinebuf, MAXCMD, input);
 	isc_app_unblock();