diff --git a/dsv/dsv b/dsv/dsv
index 46d13f4..e24594c 100755
--- a/dsv/dsv
+++ b/dsv/dsv
@@ -2,8 +2,8 @@
 #
 # dsv - Improved data sheet viewer
 #
-# Written 2010-2014 by Werner Almesberger
-# Copyright 2010-2014 Werner Almesberger
+# Written 2010-2014, 2016 by Werner Almesberger
+# Copyright 2010-2014, 2016 Werner Almesberger
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -65,7 +65,7 @@ flush()
 		echo "$nm: no URL" 1>&2
 		exit 1
 	fi
-	ds=$nm-`basename "$url"`
+	ds=$nm-`basename "$url" | tr '?&' _`
 	mkdir -p $DSV_DIR
 	if [ ! -r "$DSV_DIR/$ds" ]; then
 		if [ "$zip" ]; then