diff --git a/contrib/examples/example_app/lwipcfg.h.travis b/contrib/examples/example_app/lwipcfg.h.travis
index 496342d8..d5df939d 100644
--- a/contrib/examples/example_app/lwipcfg.h.travis
+++ b/contrib/examples/example_app/lwipcfg.h.travis
@@ -43,31 +43,31 @@
 
 #define LWIP_CHARGEN_APP              1
 #define LWIP_DNS_APP                  1
-#define LWIP_HTTPD_APP                1
+#define LWIP_HTTPD_APP                LWIP_TCP
 /* Set this to 1 to use the netconn http server,
  * otherwise the raw api server will be used. */
 /*#define LWIP_HTTPD_APP_NETCONN     */
-#define LWIP_NETBIOS_APP              1
+#define LWIP_NETBIOS_APP              LWIP_IPV4 && LWIP_UDP
 #define LWIP_NETIO_APP                1
-#define LWIP_MDNS_APP                 1
-#define LWIP_MQTT_APP                 1
+#define LWIP_MDNS_APP                 LWIP_UDP
+#define LWIP_MQTT_APP                 LWIP_TCP
 #define LWIP_PING_APP                 1
 #define LWIP_RTP_APP                  1
-#define LWIP_SHELL_APP                1
-#define LWIP_SNMP_APP                 1
-#define LWIP_SNTP_APP                 1
+#define LWIP_SHELL_APP                LWIP_TCP
+#define LWIP_SNMP_APP                 LWIP_UDP
+#define LWIP_SNTP_APP                 LWIP_UDP
 #define LWIP_SOCKET_EXAMPLES_APP      1
-#define LWIP_TCPECHO_APP              1
+#define LWIP_TCPECHO_APP              LWIP_TCP
 /* Set this to 1 to use the netconn tcpecho server,
  * otherwise the raw api server will be used. */
 /*#define LWIP_TCPECHO_APP_NETCONN   */
-#define LWIP_TFTP_APP                 1
-#define LWIP_TFTP_CLIENT_APP          1
-#define LWIP_UDPECHO_APP              1
-#define LWIP_LWIPERF_APP              1
+#define LWIP_TFTP_APP                 LWIP_UDP
+#define LWIP_TFTP_CLIENT_APP          LWIP_UDP
+#define LWIP_UDPECHO_APP              LWIP_UDP
+#define LWIP_LWIPERF_APP              LWIP_TCP
 
-#define USE_DHCP    1
-#define USE_AUTOIP  1
+#define USE_DHCP                      LWIP_DHCP
+#define USE_AUTOIP                    LWIP_AUTOIP
 
 /* define this to your custom application-init function */
 /* #define LWIP_APP_INIT my_app_init() */
diff --git a/contrib/examples/example_app/test_configs/opt_default.h b/contrib/examples/example_app/test_configs/opt_default.h
index 3012194e..67b69d20 100644
--- a/contrib/examples/example_app/test_configs/opt_default.h
+++ b/contrib/examples/example_app/test_configs/opt_default.h
@@ -71,8 +71,7 @@
 #define LWIP_MULTICAST_PING             0
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
-#define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
+#define LWIP_DHCP                       1
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/examples/example_app/test_configs/opt_dualstack.h b/contrib/examples/example_app/test_configs/opt_dualstack.h
index 59bda770..4caf490d 100644
--- a/contrib/examples/example_app/test_configs/opt_dualstack.h
+++ b/contrib/examples/example_app/test_configs/opt_dualstack.h
@@ -71,8 +71,7 @@
 #define LWIP_MULTICAST_PING             0
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
-#define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
+#define LWIP_DHCP                       LWIP_UDP
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/examples/example_app/test_configs/opt_ipv4only.h b/contrib/examples/example_app/test_configs/opt_ipv4only.h
index 3012194e..82ba4671 100644
--- a/contrib/examples/example_app/test_configs/opt_ipv4only.h
+++ b/contrib/examples/example_app/test_configs/opt_ipv4only.h
@@ -71,8 +71,7 @@
 #define LWIP_MULTICAST_PING             0
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
-#define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
+#define LWIP_DHCP                       LWIP_UDP
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/examples/example_app/test_configs/opt_ipv6only.h b/contrib/examples/example_app/test_configs/opt_ipv6only.h
index 0047a5ec..b3cb1e04 100644
--- a/contrib/examples/example_app/test_configs/opt_ipv6only.h
+++ b/contrib/examples/example_app/test_configs/opt_ipv6only.h
@@ -72,7 +72,6 @@
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
 #define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/examples/example_app/test_configs/opt_nosys_dual.h b/contrib/examples/example_app/test_configs/opt_nosys_dual.h
index 301b4bb2..17ee97ff 100644
--- a/contrib/examples/example_app/test_configs/opt_nosys_dual.h
+++ b/contrib/examples/example_app/test_configs/opt_nosys_dual.h
@@ -71,8 +71,7 @@
 #define LWIP_MULTICAST_PING             0
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
-#define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
+#define LWIP_DHCP                       1
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/examples/example_app/test_configs/opt_nosys_ipv4.h b/contrib/examples/example_app/test_configs/opt_nosys_ipv4.h
index 440ae513..024d79be 100644
--- a/contrib/examples/example_app/test_configs/opt_nosys_ipv4.h
+++ b/contrib/examples/example_app/test_configs/opt_nosys_ipv4.h
@@ -71,8 +71,7 @@
 #define LWIP_MULTICAST_PING             0
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
-#define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
+#define LWIP_DHCP                       1
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/examples/example_app/test_configs/opt_nosys_ipv6.h b/contrib/examples/example_app/test_configs/opt_nosys_ipv6.h
index aa6495ba..d0273521 100644
--- a/contrib/examples/example_app/test_configs/opt_nosys_ipv6.h
+++ b/contrib/examples/example_app/test_configs/opt_nosys_ipv6.h
@@ -72,7 +72,6 @@
 #define LWIP_RAW                        0
 #define RAW_TTL                         (IP_DEFAULT_TTL)
 #define LWIP_DHCP                       0
-#define DHCP_DOES_ARP_CHECK             ((LWIP_DHCP) && (LWIP_ARP))
 #define LWIP_DHCP_CHECK_LINK_UP         0
 #define LWIP_DHCP_BOOTP_FILE            0
 #define LWIP_DHCP_GET_NTP_SRV           0
diff --git a/contrib/ports/unix/example_app/iteropts.sh b/contrib/ports/unix/example_app/iteropts.sh
index 290d7c94..5b07a249 100755
--- a/contrib/ports/unix/example_app/iteropts.sh
+++ b/contrib/ports/unix/example_app/iteropts.sh
@@ -2,6 +2,7 @@
 
 LOGFILE=iteropts.log
 EXAPPDIR=../../../examples/example_app
+RETVAL=0
 
 pushd `dirname "$0"`
 pwd
@@ -16,9 +17,10 @@ do
     rm $EXAPPDIR/lwipopts_test.h
     # cat the file to update its timestamp
     cat $f > $EXAPPDIR/lwipopts_test.h
-    make TESTFLAGS=-DLWIP_OPTTEST_FILE -j 8 &> $BUILDLOG 2>&1 || echo file $f failed >> $LOGFILE; cat $BUILDLOG
+    make TESTFLAGS=-DLWIP_OPTTEST_FILE -j 8 &> $BUILDLOG 2>&1 || (RETVAL=1; echo file $f failed >> $LOGFILE; echo ++++++++ $f FAILED +++++++; cat $BUILDLOG)
     echo test $f done >> $LOGFILE
 done
 echo done, cleaning
 make clean
 popd
+exit $RETVAL