diff --git a/CHANGES b/CHANGES
index 7b339008b6..46fc419098 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 483.	[bug]		nslookup: "set all" showed search but it was not
+			setable.
+
  482.	[bug]		nslookup: a plain "server" or "lserver" should be
 			treated as a lookup.
 
diff --git a/bin/dig/nslookup.c b/bin/dig/nslookup.c
index a560ff2778..acb9d87100 100644
--- a/bin/dig/nslookup.c
+++ b/bin/dig/nslookup.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: nslookup.c,v 1.47 2000/09/21 12:25:42 marka Exp $ */
+/* $Id: nslookup.c,v 1.48 2000/09/21 12:45:39 marka Exp $ */
 
 #include <config.h>
 
@@ -681,6 +681,10 @@ setoption(char *opt) {
 		debugging = ISC_TRUE;
 	} else if (strncasecmp(opt, "nod2", 4) == 0) {
 		debugging = ISC_FALSE;
+	} else if (strncasecmp(opt, "search",3) == 0) {
+		usesearch = ISC_TRUE;
+	} else if (strncasecmp(opt, "nosearch",5) == 0) {
+		usesearch = ISC_FALSE;
 	} else if (strncasecmp(opt, "sil",3) == 0) {
 		deprecation_msg = ISC_FALSE;
 	} else {