diff --git a/configure b/configure
index 1d7656f..5e48c2b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for motion trunk-r403.
+# Generated by GNU Autoconf 2.61 for motion trunk-r405.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='motion'
 PACKAGE_TARNAME='motion'
-PACKAGE_VERSION='trunk-r403'
-PACKAGE_STRING='motion trunk-r403'
+PACKAGE_VERSION='trunk-r405'
+PACKAGE_STRING='motion trunk-r405'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="motion.c"
@@ -1177,7 +1177,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures motion trunk-r403 to adapt to many kinds of systems.
+\`configure' configures motion trunk-r405 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1238,7 +1238,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of motion trunk-r403:";;
+     short | recursive ) echo "Configuration of motion trunk-r405:";;
    esac
   cat <<\_ACEOF
 
@@ -1374,7 +1374,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-motion configure trunk-r403
+motion configure trunk-r405
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1388,7 +1388,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by motion $as_me trunk-r403, which was
+It was created by motion $as_me trunk-r405, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -8139,7 +8139,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by motion $as_me trunk-r403, which was
+This file was extended by motion $as_me trunk-r405, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -8188,7 +8188,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-motion config.status trunk-r403
+motion config.status trunk-r405
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/motion-dist.conf.in b/motion-dist.conf.in
index 7b18662..6c620e5 100644
--- a/motion-dist.conf.in
+++ b/motion-dist.conf.in
@@ -28,14 +28,14 @@ setup_mode off
 # for FreeBSD default is /dev/bktr0
 videodevice /dev/video0
 
-# v4l2_palette allow to choose preferable palette to be use by motion
-# to capture from those supported by your videodevice. ( default: 8)
-# i.ex if your videodevice supports V4L2_PIX_FMT_SBGGR8 and
-# V4L2_PIX_FMT_MJPEG by default motion will use V4L2_PIX_FMT_MJPEG so
-# set v4l2_palette 1 to force motion use V4L2_PIX_FMT_SBGGR8 instead. 
+# v4l2_palette allows to choose preferable palette to be use by motion
+# to capture from those supported by your videodevice. (default: 8)
+# E.g. if your videodevice supports both V4L2_PIX_FMT_SBGGR8 and
+# V4L2_PIX_FMT_MJPEG then motion will by default use V4L2_PIX_FMT_MJPEG.
+# Setting v4l2_palette to 1 forces motion to use V4L2_PIX_FMT_SBGGR8
+# instead.
 #
 # Values :
-#
 # V4L2_PIX_FMT_SN9C10X : 0  'S910'
 # V4L2_PIX_FMT_SBGGR8  : 1  'BA81'
 # V4L2_PIX_FMT_MJPEG   : 2  'MJPEG'
@@ -89,12 +89,11 @@ minimum_frame_time 0
 # Syntax is user:password
 ; netcam_userpass value
 
-
 # The setting for keep-alive of network socket, should improve performance on compatible net cameras.
-# off : the historical implementation using HTTP/1.0, closing the socket after each http request.
-# force : Use HTTP/1.0 requests with keep alive header to reuse the same connection.
-# on : Use HTTP/1.1 requests that support keep alive as default.
-# Default: off 
+# off:   The historical implementation using HTTP/1.0, closing the socket after each http request.
+# force: Use HTTP/1.0 requests with keep alive header to reuse the same connection.
+# on:    Use HTTP/1.1 requests that support keep alive as default.
+# Default: off
 netcam_keepalive off
 
 # URL to use for a netcam proxy server, if required, e.g. "http://myproxy".
@@ -104,7 +103,7 @@ netcam_keepalive off
 
 # Set less strict jpeg checks for network cameras with a poor/buggy firmware.
 # Default: off
-netcam_broken off
+netcam_tolerant_check off
 
 # Let motion regulate the brightness of a video device (default: off).
 # The auto_brightness feature uses the brightness option as its target value.
diff --git a/thread4.conf.in b/thread4.conf.in
index b72ff4a..64a6363 100644
--- a/thread4.conf.in
+++ b/thread4.conf.in
@@ -2,8 +2,6 @@
 #
 # This config file was generated by @PACKAGE_NAME@ @PACKAGE_VERSION@ 
 
-
-
 ###########################################################
 # Capture device options
 ############################################################
@@ -13,22 +11,21 @@
 netcam_url http://192.168.1.6:8093/
 
 # The setting for keep-alive of network socket, should improve performance on compatible net cameras.
-# off : the historical implementation using HTTP/1.0, closing the socket after each http request.
-# force : Use HTTP/1.0 requests with keep alive header to reuse the same connection.
-# on : Use HTTP/1.1 requests that support keep alive as default.
-# Default: off 
+# off:   The historical implementation using HTTP/1.0, closing the socket after each http request.
+# force: Use HTTP/1.0 requests with keep alive header to reuse the same connection.
+# on:    Use HTTP/1.1 requests that support keep alive as default.
+# Default: off
 netcam_keepalive force
- 
-# The video input to be used (default: 8)
-# Should normally be set to 1 for video/TV cards, and 8 for USB cameras 
-input 1
+
+# Set less strict jpeg checks for network cameras with a poor/buggy firmware.
+# Default: off
+netcam_tolerant_check on
 
 # Draw a user defined text on the images using same options as C function strftime(3)
 # Default: Not defined = no text
 # Text is placed in lower left corner
 text_left CAMERA 4
 
-
 ############################################################
 # Target Directories and filenames For Images And Films
 # For the options snapshot_, picture_, mpeg_ and timelapse_filename