diff --git a/src/cdrom/cdrom_image_viso.c b/src/cdrom/cdrom_image_viso.c
index 94b4e44ca..c0c3bbf51 100644
--- a/src/cdrom/cdrom_image_viso.c
+++ b/src/cdrom/cdrom_image_viso.c
@@ -247,17 +247,28 @@ viso_convert_utf8(wchar_t *dest, const char *src, ssize_t buf_size)
                         c -= 'a' - 'A';                                             \
                     break;                                                          \
                                                                                     \
-                case ' ':                                                           \
                 case '!':                                                           \
-                case '"':                                                           \
+                case '#':                                                           \
+                case '$':                                                           \
                 case '%':                                                           \
                 case '&':                                                           \
                 case '\'':                                                          \
                 case '(':                                                           \
                 case ')':                                                           \
+                case '-':                                                           \
+                case '@':                                                           \
+                case '^':                                                           \
+                case '`':                                                           \
+                case '{':                                                           \
+                case '}':                                                           \
+                case '~':                                                           \
+                    /* Valid on all sets (non-complying DOS characters). */         \
+                    break;                                                          \
+                                                                                    \
+                case ' ':                                                           \
+                case '"':                                                           \
                 case '+':                                                           \
                 case ',':                                                           \
-                case '-':                                                           \
                 case '.':                                                           \
                 case '<':                                                           \
                 case '=':                                                           \