diff --git a/CHANGES b/CHANGES
index f0fe8fdf7d..eea376f97d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1333.	[func]		Query log now says if the query was signed (S) or
+			if EDNS was used (E).
+
 1332.	[func]		Log TSIG key used w/ outgoing zone transfers.
 
 1331.	[bug]		lwres_getrrsetbyname leaked memory.  [RT #3159]
diff --git a/bin/named/query.c b/bin/named/query.c
index a1a45236a4..af2d20a3c8 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.220 2002/06/17 04:01:08 marka Exp $ */
+/* $Id: query.c,v 1.221 2002/06/25 04:12:51 marka Exp $ */
 
 #include <config.h>
 
@@ -3251,8 +3251,10 @@ log_query(ns_client_t *client) {
 	dns_rdatatype_format(rdataset->type, typename, sizeof(typename));
 
 	ns_client_log(client, NS_LOGCATEGORY_QUERIES, NS_LOGMODULE_QUERY,
-		      level, "query: %s %s %s %s", namebuf, classname,
-		      typename, WANTRECURSION(client) ? "+" : "-");
+		      level, "query: %s %s %s %s%s%s", namebuf, classname,
+		      typename, WANTRECURSION(client) ? "+" : "-",
+		      (client->signer != NULL) ? "S": "",
+		      (client->opt != NULL) ? "E" : "");
 }
 
 void