diff --git a/debian/motion.conf b/debian/motion.conf
index e6addc95..1a8fa628 100644
--- a/debian/motion.conf
+++ b/debian/motion.conf
@@ -1,6 +1,6 @@
 # Rename this distribution example file to motion.conf
 #
-# This config file was generated by motion 3.2.5
+# This config file was generated by motion 3.2.8
 
 
 ############################################################
@@ -11,7 +11,7 @@
 daemon off
 
 # File to store the process ID, also called pid file. (default: not defined)
-process_id_file /var/run/motion.pid
+process_id_file /var/run/motion.pid 
 
 ############################################################
 # Basic Setup Mode
@@ -208,7 +208,10 @@ ppm off
 
 
 ############################################################
-# Film (mpeg) File Output - ffmpeg based
+# FFMPEG related options
+# Film (mpeg) file output, and deinterlacing of the video input
+# The options movie_filename and timelapse_filename are also used
+# by the ffmpeg feature
 ############################################################
 
 # Use ffmpeg to encode mpeg movies in realtime (default: off)
@@ -243,8 +246,14 @@ ffmpeg_variable_bitrate 0
 # mpeg4 or msmpeg4 - give you files with extension .avi
 # msmpeg4 is recommended for use with Windows Media Player because
 # it requires no installation of codec on the Windows client.
+# swf - gives you a flash film with extension .swf
 ffmpeg_video_codec mpeg4
 
+# Use ffmpeg to deinterlace video. Necessary if you use an analog camera
+# and see horizontal combing on moving objects in video or pictures.
+# (default: off)
+ffmpeg_deinterlace off
+
 
 ############################################################
 # Snapshots (Traditional Periodic Webcam File Output)
@@ -287,7 +296,7 @@ text_right %Y-%m-%d\n%T-%q
 # Text is placed in upper right corner
 text_changes off
 
-# This option defines the value of the speciel event conversion specifier %C
+# This option defines the value of the special event conversion specifier %C
 # You can use any conversion specifier in this option except %C. Date and time
 # values are from the timestamp of the first image in the current event.
 # Default: %Y%m%d%H%M%S
@@ -315,7 +324,7 @@ text_double off
 
 # Target base directory for pictures and films
 # Recommended to use absolute path. (Default: current working directory)
-target_dir /tmp
+target_dir /tmp/motion
 
 # File path for snapshots (jpeg or ppm) relative to target_dir
 # Default: %v-%Y%m%d%H%M%S-snapshot
@@ -340,6 +349,7 @@ jpeg_filename %v-%Y%m%d%H%M%S-%q
 # Default value is equivalent to legacy oldlayout option
 # For Motion 3.0 compatible mode choose: %Y/%m/%d/%H%M%S
 # File extension .mpg or .avi is automatically added so do not include this
+# This option was previously called ffmpeg_filename
 movie_filename %v-%Y%m%d%H%M%S
 
 # File path for timelapse mpegs relative to target_dir
@@ -400,7 +410,7 @@ control_html_output on
 
 # Type of tracker (0=none (default), 1=stepper, 2=iomojo, 3=pwc, 4=generic)
 # The generic type enables the definition of motion center and motion size to
-# be used with the convertion specifiers for options like on_motion_detected
+# be used with the conversion specifiers for options like on_motion_detected
 track_type 0
 
 # Enable auto tracking (default: off)
@@ -412,9 +422,15 @@ track_auto off
 # Motor number for x-axis (default: -1)
 track_motorx -1
 
+# Motor number for y-axis (default: -1)
+track_motory -1
+
 # Maximum value on x-axis (default: 0)
 track_maxx 0
 
+# Maximum value on y-axis (default: 0)
+track_maxy 0
+
 # ID of an iomojo camera if used (default: 0)
 track_iomojo_id 0
 
@@ -428,7 +444,7 @@ track_step_angle_x 10
 # Currently only used with pwc type cameras
 track_step_angle_y 10
 
-# Delay to wait for after auto-track movement as number
+# Delay to wait for after tracking movement as number
 # of picture frames (default: 10)
 track_move_wait 10
 
diff --git a/video2.c b/video2.c
index baee06b7..d5d1c343 100644
--- a/video2.c
+++ b/video2.c
@@ -794,9 +794,9 @@ int v4l2_next(struct context *cnt, struct video_dev *viddev, unsigned char *map,
 					motion_log(LOG_INFO,0,"Error decoding MJPEG");
 					return 1;
 				}
+				memcpy(map, temp_netcam_buff.ptr, viddev->v4l_bufsize);
+				return 0;
 
-				return conv_jpeg2yuv420(cnt, map, &temp_netcam_buff, viddev->v4l_bufsize, width,
-							height);
 			}
 #endif
 		case V4L2_PIX_FMT_JPEG: