diff --git a/make_encode_sets.py b/make_encode_sets.py
index 780a74bc..017abbe1 100644
--- a/make_encode_sets.py
+++ b/make_encode_sets.py
@@ -28,10 +28,10 @@
     ('USERINFO', r''' "#<>`?@'''),
     ('PASSWORD', r''' "#<>`?@\/'''),
     ('USERNAME', r''' "#<>`?@\/:'''),
-    ('FORM_URLENCODED', r''' !"#$%&\'()+,/:;<=>?@[\]^`{|}'''),
+    ('FORM_URLENCODED', r''' !"#$%&\'()+,/:;<=>?@[\]^`{|}~'''),
 ]:
     print(
-        "pub static %s: [&'static str, ..256] = [\n%s\n];\n\n"
+        "pub static %s: [&'static str; 256] = [\n%s\n];\n\n"
         % (name, '\n'.join(
             '   ' + ' '.join(
                 '"%s%s",' % ("\\" if chr(b) in '\\"' else "", chr(b))
diff --git a/src/encode_sets.rs b/src/encode_sets.rs
index d0dcf5cb..587de629 100644
--- a/src/encode_sets.rs
+++ b/src/encode_sets.rs
@@ -240,7 +240,7 @@ pub static FORM_URLENCODED: [&'static str; 256] = [
    "%60", "a", "b", "c", "d", "e", "f", "g",
    "h", "i", "j", "k", "l", "m", "n", "o",
    "p", "q", "r", "s", "t", "u", "v", "w",
-   "x", "y", "z", "%7B", "%7C", "%7D", "~", "%7F",
+   "x", "y", "z", "%7B", "%7C", "%7D", "%7E", "%7F",
    "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
    "%88", "%89", "%8A", "%8B", "%8C", "%8D", "%8E", "%8F",
    "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",