diff --git a/lists/amazon-aws/list.json b/lists/amazon-aws/list.json
index 361f069..dd74814 100644
--- a/lists/amazon-aws/list.json
+++ b/lists/amazon-aws/list.json
@@ -1,7 +1,4 @@
 {
-  "name": "List of known Amazon AWS IP address ranges",
-  "version": 20180221,
-  "description": "Amazon AWS IP address ranges (https://ip-ranges.amazonaws.com/ip-ranges.json)",
   "list": [
     "103.246.148.0/23",
     "103.246.150.0/23",
@@ -115,7 +112,233 @@
     "216.137.32.0/19",
     "216.182.224.0/20",
     "23.20.0.0/14",
+    "2400:6500:0:7000::/56",
+    "2400:6500:0:7100::/56",
+    "2400:6500:0:7200::/56",
+    "2400:6500:0:7400::/56",
+    "2400:6500:0:7500::/56",
+    "2400:6500:100:7100::/56",
+    "2400:6500:100:7200::/56",
+    "2400:6500:ff00::/64",
+    "2400:6500:ff00::36fb:1f80/122",
+    "2400:6500:ff00::36ff:fec0/122",
+    "2400:6700:ff00::/64",
+    "2400:6700:ff00::36f8:dc00/122",
+    "2400:6700:ff00::36fa:fdc0/122",
+    "2403:b300:ff00::/64",
+    "2403:b300:ff00::36fc:4f80/122",
+    "2403:b300:ff00::36fc:fec0/122",
+    "2406:da00:2000::/40",
+    "2406:da00:4000::/40",
+    "2406:da00:8000::/40",
+    "2406:da00:a000::/40",
+    "2406:da00:c000::/40",
+    "2406:da00:ff00::/64",
+    "2406:da00:ff00::36f3:1fc0/122",
+    "2406:da00:ff00::6b17:ff00/122",
+    "2406:da12::/36",
+    "2406:da14:7ff:f800::/53",
+    "2406:da14::/36",
+    "2406:da14:fff:f800::/53",
+    "2406:da18:7ff:f800::/53",
+    "2406:da18::/36",
+    "2406:da18:fff:f800::/53",
+    "2406:da1a::/36",
+    "2406:da1c:7ff:f800::/53",
+    "2406:da1c::/36",
+    "2406:da1c:fff:f800::/53",
+    "2406:daa0:2000::/40",
+    "2406:daa0:4000::/40",
+    "2406:daa0:8000::/40",
+    "2406:daa0:a000::/40",
+    "2406:daa0:c000::/40",
+    "2406:daf8:2000::/40",
+    "2406:daf8:4000::/40",
+    "2406:daf8:8000::/40",
+    "2406:daf8:a000::/40",
+    "2406:daf8:c000::/40",
+    "2406:daf9:2000::/40",
+    "2406:daf9:4000::/40",
+    "2406:daf9:8000::/40",
+    "2406:daf9:a000::/40",
+    "2406:daf9:c000::/40",
+    "2406:dafa:2000::/40",
+    "2406:dafa:4000::/40",
+    "2406:dafa:8000::/40",
+    "2406:dafa:a000::/40",
+    "2406:dafa:c000::/40",
+    "2406:dafc:2000::/40",
+    "2406:dafc:4000::/40",
+    "2406:dafc:8000::/40",
+    "2406:dafc:a000::/40",
+    "2406:dafc:c000::/40",
+    "2406:dafe:2000::/40",
+    "2406:dafe:4000::/40",
+    "2406:dafe:8000::/40",
+    "2406:dafe:a000::/40",
+    "2406:dafe:c000::/40",
+    "2406:daff:2000::/40",
+    "2406:daff:4000::/40",
+    "2406:daff:8000::/40",
+    "2406:daff:a000::/40",
+    "2406:daff:c000::/40",
+    "240f:8000:4000::/40",
+    "240f:8000:8000::/40",
+    "240f:8014::/36",
+    "240f:8018::/36",
+    "240f:80a0:4000::/40",
+    "240f:80a0:8000::/40",
+    "240f:80f8:4000::/40",
+    "240f:80f8:8000::/40",
+    "240f:80f9:4000::/40",
+    "240f:80f9:8000::/40",
+    "240f:80fa:4000::/40",
+    "240f:80fa:8000::/40",
+    "240f:80fc:4000::/40",
+    "240f:80fc:8000::/40",
+    "240f:80fe:4000::/40",
+    "240f:80fe:8000::/40",
+    "240f:80ff:4000::/40",
+    "240f:80ff:8000::/40",
+    "2600:1f00:1000::/40",
+    "2600:1f00:2000::/40",
+    "2600:1f00:4000::/40",
+    "2600:1f00:6000::/40",
+    "2600:1f00:8000::/40",
+    "2600:1f00:c000::/40",
+    "2600:1f00:e000::/40",
+    "2600:1f11::/36",
+    "2600:1f12::/36",
+    "2600:1f14:7ff:f800::/53",
+    "2600:1f14::/35",
+    "2600:1f14:fff:f800::/53",
+    "2600:1f16::/36",
+    "2600:1f18:3fff:f800::/53",
+    "2600:1f18:7fff:f800::/53",
+    "2600:1f18::/33",
+    "2600:1f1c:7ff:f800::/53",
+    "2600:1f1c::/36",
+    "2600:1f1c:fff:f800::/53",
+    "2600:1f1e:7ff:f800::/53",
+    "2600:1f1e::/36",
+    "2600:1f1e:fff:f800::/53",
+    "2600:1fa0:1000::/40",
+    "2600:1fa0:2000::/40",
+    "2600:1fa0:4000::/40",
+    "2600:1fa0:6000::/40",
+    "2600:1fa0:8000::/40",
+    "2600:1fa0:c000::/40",
+    "2600:1fa0:e000::/40",
+    "2600:1ff8:1000::/40",
+    "2600:1ff8:2000::/40",
+    "2600:1ff8:4000::/40",
+    "2600:1ff8:6000::/40",
+    "2600:1ff8:8000::/40",
+    "2600:1ff8:c000::/40",
+    "2600:1ff8:e000::/40",
+    "2600:1ff9:1000::/40",
+    "2600:1ff9:2000::/40",
+    "2600:1ff9:4000::/40",
+    "2600:1ff9:6000::/40",
+    "2600:1ff9:8000::/40",
+    "2600:1ff9:c000::/40",
+    "2600:1ff9:e000::/40",
+    "2600:1ffa:1000::/40",
+    "2600:1ffa:2000::/40",
+    "2600:1ffa:4000::/40",
+    "2600:1ffa:6000::/40",
+    "2600:1ffa:8000::/40",
+    "2600:1ffa:c000::/40",
+    "2600:1ffa:e000::/40",
+    "2600:1ffc:1000::/40",
+    "2600:1ffc:2000::/40",
+    "2600:1ffc:4000::/40",
+    "2600:1ffc:6000::/40",
+    "2600:1ffc:8000::/40",
+    "2600:1ffc:c000::/40",
+    "2600:1ffc:e000::/40",
+    "2600:1ffe:1000::/40",
+    "2600:1ffe:2000::/40",
+    "2600:1ffe:4000::/40",
+    "2600:1ffe:6000::/40",
+    "2600:1ffe:8000::/40",
+    "2600:1ffe:c000::/40",
+    "2600:1ffe:e000::/40",
+    "2600:1fff:1000::/40",
+    "2600:1fff:2000::/40",
+    "2600:1fff:4000::/40",
+    "2600:1fff:6000::/40",
+    "2600:1fff:8000::/40",
+    "2600:1fff:c000::/40",
+    "2600:1fff:e000::/40",
+    "2600:9000::/28",
+    "2620:107:300f::/64",
+    "2620:107:300f::36b7:ff80/122",
+    "2620:107:300f::36f1:2040/122",
+    "2620:107:4000:5::/64",
+    "2620:107:4000:7000::/56",
+    "2620:107:4000:7100::/56",
+    "2620:107:4000:7200::/56",
+    "2620:107:4000:7400::/56",
+    "2620:107:4000:7700::/56",
+    "2620:107:4000:7800::/56",
+    "2620:107:4007::/64",
+    "2620:108:7000::/44",
+    "2620:108:700f::/64",
+    "2620:108:700f::36f4:34c0/122",
+    "2620:108:700f::36f5:a800/122",
+    "2620:108:d000::/44",
+    "2620:108:d00f::/64",
     "27.0.0.0/22",
+    "2804:800:0:7000::/56",
+    "2804:800:ff00::/64",
+    "2804:800:ff00::36e8:2840/122",
+    "2804:800:ff00::b147:cf80/122",
+    "2a01:578:0:7000::/56",
+    "2a01:578:0:7100::/56",
+    "2a01:578:0:7200::/56",
+    "2a01:578:13::/64",
+    "2a01:578:3::/64",
+    "2a01:578:3::36e4:1000/122",
+    "2a01:578:3::b022:9fc0/122",
+    "2a05:d000:2000::/40",
+    "2a05:d000:4000::/40",
+    "2a05:d000:8000::/40",
+    "2a05:d000:c000::/40",
+    "2a05:d012::/36",
+    "2a05:d014::/36",
+    "2a05:d018:7ff:f800::/53",
+    "2a05:d018::/36",
+    "2a05:d018:fff:f800::/53",
+    "2a05:d01c::/36",
+    "2a05:d050:2000::/40",
+    "2a05:d050:4000::/40",
+    "2a05:d050:8000::/40",
+    "2a05:d050:c000::/40",
+    "2a05:d078:2000::/40",
+    "2a05:d078:4000::/40",
+    "2a05:d078:8000::/40",
+    "2a05:d078:c000::/40",
+    "2a05:d079:2000::/40",
+    "2a05:d079:4000::/40",
+    "2a05:d079:8000::/40",
+    "2a05:d079:c000::/40",
+    "2a05:d07a:2000::/40",
+    "2a05:d07a:4000::/40",
+    "2a05:d07a:8000::/40",
+    "2a05:d07a:c000::/40",
+    "2a05:d07c:2000::/40",
+    "2a05:d07c:4000::/40",
+    "2a05:d07c:8000::/40",
+    "2a05:d07c:c000::/40",
+    "2a05:d07e:2000::/40",
+    "2a05:d07e:4000::/40",
+    "2a05:d07e:8000::/40",
+    "2a05:d07e:c000::/40",
+    "2a05:d07f:2000::/40",
+    "2a05:d07f:4000::/40",
+    "2a05:d07f:8000::/40",
+    "2a05:d07f:c000::/40",
     "34.192.0.0/12",
     "34.195.252.0/24",
     "34.208.0.0/12",
@@ -668,6 +891,9 @@
     "96.127.0.0/17"
   ],
   "type": "cidr",
+  "name": "List of known Amazon AWS IP address ranges",
+  "description": "Amazon AWS IP address ranges (https://ip-ranges.amazonaws.com/ip-ranges.json)",
+  "version": 20180222,
   "matching_attributes": [
     "ip-src",
     "ip-dst",
diff --git a/tools/generate-amazon-aws.py b/tools/generate-amazon-aws.py
index 575583a..4d2c39b 100644
--- a/tools/generate-amazon-aws.py
+++ b/tools/generate-amazon-aws.py
@@ -16,7 +16,7 @@ for prefix in j['prefixes']:
    l.append(prefix['ip_prefix'])
 
 for prefix in j['ipv6_prefixes']:
-   prefix['ipv6_prefix']
+   l.append(prefix['ipv6_prefix'])
    
 warninglist = {}
 warninglist['name'] = 'List of known Amazon AWS IP address ranges'