diff --git a/weboob/applications/videoob/videoob.py b/weboob/applications/videoob/videoob.py
index 32e4807d..8b7e72e2 100644
--- a/weboob/applications/videoob/videoob.py
+++ b/weboob/applications/videoob/videoob.py
@@ -118,10 +118,13 @@ class Videoob(ReplApplication):
                 print >>sys.stderr, 'Please install "wget"'
                 return 1
 
-        if dest is not None:
-            os.system('wget %s -O %s' % (video.url, dest))
-        else:
-            os.system('wget %s' % (video.url))
+        if dest is None:
+            ext = video.ext
+            if not ext:
+                ext = 'avi'
+            dest = '%s.%s' % (video.id, ext)
+
+        os.system('wget "%s" -O "%s"' % (video.url, dest))
 
     def complete_play(self, text, line, *ignored):
         args = line.split(' ')