@@ -51,11 +51,13 @@
 		    @"  Show this help\n    "
 		    @"-s  --server"
 		    @"  The server to query\n    "
 		    @"-t  --type  "
 		    @"  The record type to query (defaults to ALL, can be "
-		    @"repeated)")];
+		    @"repeated)\n    "
+		    @"    --tcp   "
+		    @"  Force using TCP for the query")];
 	}
 
 	[OFApplication terminateWithStatus: status];
 }
 
@@ -82,15 +84,17 @@
 }
 
 - (void)applicationDidFinishLaunching: (OFNotification *)notification
 {
 	OFString *DNSClassString, *server;
+	bool forceTCP;
 	const OFOptionsParserOption options[] = {
 		{ 'c', @"class", 1, NULL, &DNSClassString },
 		{ 'h', @"help", 0, NULL, NULL },
 		{ 's', @"server", 1, NULL, &server },
 		{ 't', @"type", 1, NULL, NULL },
+		{ '\0', @"tcp", 0, &forceTCP, NULL },
 		{ '\0', nil, 0, NULL, NULL }
 	};
 	OFMutableArray OF_GENERIC(OFString *) *recordTypes;
 	OFOptionsParser *optionsParser;
 	OFUnichar option;
@@ -180,20 +184,21 @@
 
 	if (remainingArguments.count < 1)
 		help(OFStdErr, false, 1);
 
 	resolver = [OFDNSResolver resolver];
+	resolver.configReloadInterval = 0;
+	resolver.forcesTCP = forceTCP;
+
 	DNSClass = (DNSClassString != nil
 	    ? OFDNSClassParseName(DNSClassString) : OFDNSClassIN);
 
 	if (recordTypes.count == 0)
 		[recordTypes addObject: @"ALL"];
 
-	if (server != nil) {
-		resolver.configReloadInterval = 0;
+	if (server != nil)
 		resolver.nameServers = [OFArray arrayWithObject: server];
-	}
 
 	for (OFString *domainName in remainingArguments) {
 		for (OFString *recordTypeString in recordTypes) {
 			OFDNSRecordType recordType =
 			    OFDNSRecordTypeParseName(recordTypeString);