diff --git a/scan_engine.cc b/scan_engine.cc
index d4bebf862..380d06095 100644
--- a/scan_engine.cc
+++ b/scan_engine.cc
@@ -924,7 +924,7 @@ GroupScanStats::GroupScanStats(UltraScanInfo *UltraSI) {
   initialize_timeout_info(&to);
   /* Default timout should be much lower for arp */
   if (USI->ping_scan_arp)
-    to.timeout = MIN(o.initialRttTimeout(), 100) * 1000;
+    to.timeout = MAX(o.minRttTimeout(), MIN(o.initialRttTimeout(), 100)) * 1000;
   num_probes_active = 0;
   numtargets = USI->numIncompleteHosts(); // They are all incomplete at the beginning
   numprobes = USI->numProbesPerHost();
diff --git a/targets.cc b/targets.cc
index 496a0802c..2d884afbf 100644
--- a/targets.cc
+++ b/targets.cc
@@ -117,7 +117,7 @@ static void arpping(Target *hostbatch[], int num_hosts) {
   for (targetno = 0; targetno < num_hosts; targetno++) {
     initialize_timeout_info(&hostbatch[targetno]->to);
     /* Default timout should be much lower for arp */
-    hostbatch[targetno]->to.timeout = MIN(o.initialRttTimeout(), 100) * 1000;
+    hostbatch[targetno]->to.timeout = MAX(o.minRttTimeout(), MIN(o.initialRttTimeout(), 100)) * 1000;
     if (!hostbatch[targetno]->SrcMACAddress()) {
       bool islocal = islocalhost(hostbatch[targetno]->v4hostip());
       if (islocal) {