diff -Nru winff-1.3.2/debian/changelog winff-1.3.2/debian/changelog
--- winff-1.3.2/debian/changelog	2011-06-27 21:14:56.000000000 +0200
+++ winff-1.3.2/debian/changelog	2011-10-10 20:41:58.000000000 +0200
@@ -1,3 +1,9 @@
+winff (1.3.2-4ubuntu1) oneiric; urgency=low
+
+  * Update presets shipped with Ubuntu so that they work (LP: #871332)
+
+ -- Paul Gevers <paul@climbing.nl>  Mon, 10 Oct 2011 20:39:11 +0200
+
 winff (1.3.2-4) unstable; urgency=low
 
   * Update Chinese translations (Upstream: #118)
diff -Nru winff-1.3.2/debian/control winff-1.3.2/debian/control
--- winff-1.3.2/debian/control	2011-06-26 20:31:32.000000000 +0200
+++ winff-1.3.2/debian/control	2011-10-10 20:46:03.000000000 +0200
@@ -1,7 +1,8 @@
 Source: winff
 Section: video
 Priority: extra
-Maintainer: Paul Gevers <paul@climbing.nl>
+Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
+XSBC-Original-Maintainer: Paul Gevers <paul@climbing.nl>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0~),
 	       lcl,
diff -Nru winff-1.3.2/debian/presets-ubuntu.xml winff-1.3.2/debian/presets-ubuntu.xml
--- winff-1.3.2/debian/presets-ubuntu.xml	2011-03-26 09:02:21.000000000 +0100
+++ winff-1.3.2/debian/presets-ubuntu.xml	2011-10-10 20:32:47.000000000 +0200
@@ -92,31 +92,31 @@
   </X5WS>
   <XviDAVIFS>
     <label>XviD FullScreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 640x480 -aspect 4:3 -maxrate 1800kb -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -flags +4mv -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 640x480 -aspect 4:3 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
     <extension>avi</extension>
     <category>AVI</category>
   </XviDAVIFS>
   <XviDAVIWS>
     <label>XviD Widescreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 704x384 -aspect 16:9 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -flags +4mv -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 704x384 -aspect 16:9 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
     <extension>avi</extension>
     <category>AVI</category>
   </XviDAVIWS>
   <XviDAVIWSAna>
     <label>XviD Widescreen Anamorphic</label>
-    <params>-f avi -r 29.97 -croptop 58 -cropbottom 62 -vcodec libxvid -vtag XVID -s 640x272 -aspect 2.35 -maxrate 1800kb -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -flags +4mv -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -vf crop=iw:ih-58-62:0:58 -vcodec libxvid -vtag XVID -s 640x272 -aspect 2.35 -maxrate 1800k -b 1500k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
     <extension>avi</extension>
     <category>AVI</category>
   </XviDAVIWSAna>
   <XviDAVIZENFS>
     <label>Zen Fullscreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 320x240 -aspect 4:3 -maxrate 1800kb -b 1500k  -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 320x240 -aspect 4:3 -maxrate 1800k -b 1500k  -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
     <extension>avi</extension>
     <category>Creative Zen</category>
   </XviDAVIZENFS>
   <XviDAVIZENWS>
     <label>Zen Widescreen</label>
-    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 320x240 -aspect 16:9 -maxrate 1800kb -b 1500k  -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
+    <params>-f avi -r 29.97 -vcodec libxvid -vtag XVID -s 320x240 -aspect 16:9 -maxrate 1800k -b 1500k  -acodec libmp3lame -ar 48000 -ab 128k -ac 2</params>
     <extension>avi</extension>
     <category>Creative Zen</category>
   </XviDAVIZENWS>
@@ -242,7 +242,7 @@
   </ntscvcdhq>
   <ogg1>
     <label>OGG</label>
-    <params>-acodec libvorbis -aq 60 -vn -ac 2</params>
+    <params>-acodec libvorbis -aq 3 -vn -ac 2</params>
     <extension>ogg</extension>
     <category>Audio</category>
   </ogg1>
@@ -326,19 +326,19 @@
   </N810FS>
   <N810WS>
     <label>Nokia N810 mplayer 16:9</label>
-    <params>-r 29.97 -vcodec libxvid -vtag XVID -s 400x240 -aspect 16:9 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -flags +4mv -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
+    <params>-r 29.97 -vcodec libxvid -vtag XVID -s 400x240 -aspect 16:9 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
     <extension>avi</extension>
     <category>Nokia</category>
   </N810WS>
   <N810WS2>
     <label>Nokia N810 mplayer CinemaScope 24:10</label>
-    <params>-r 29.97 -vcodec libxvid -vtag XVID -s 400x240 -aspect 24:10 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -flags +4mv -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
+    <params>-r 29.97 -vcodec libxvid -vtag XVID -s 400x240 -aspect 24:10 -maxrate 1200k -b 1200k -qmin 3 -qmax 5 -bufsize 4096 -mbd 2 -bf 2 -trellis -aic -cmp 2 -subcmp 2 -g 300 -acodec libmp3lame -ar 44100 -ab 160k -ac 2 -async 1</params>
     <extension>avi</extension>
     <category>Nokia</category>
   </N810WS2>
   <tuna-Vids>
     <label>Tuna-vIDS</label>
-    <params>-f avi -r 10 -s 256x192 -b 192k -bt 64k -vcodec libxvid -deinterlace -acodec libmp3lame -ar 32000 -ab 96k -ac 2</params>
+    <params>-f avi -r 10 -s 256x192 -aspect 256:192 -b 192k -bt 64k -vcodec libxvid -deinterlace -acodec libmp3lame -ar 32000 -ab 96k -ac 2</params>
     <extension>avi</extension>
     <category>Tuna-Vids</category>
   </tuna-Vids>