diff --git a/debian/watch b/debian/watch
index 9dbb3590c7caee3125c5a78377d3265486e2c8ed..c7529c10a29245bdcd4b463dcfe46ceab8760432 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,6 @@
-# Watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
 version=3
-
-http://www.irisa.fr/lagadic/visp/download.html http://gforge.inria.fr/frs/download.php/.*/ViSP-(.*).tar.gz
+# Mangle upstream pre-releases to make sure they are ordered before
+# the final release.
+opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
+http://www.irisa.fr/lagadic/visp/download.html \
+(?:.*/|)ViSP-(\d\S*)\.(?:tar\.(?:gz|bz2|xz)|tgz|tbz2|txz|zip)(?:|\?\S+)