diff --git a/_includes/consoleVersionSelect.html b/_includes/consoleVersionSelect.html
index e78a17e77b..68db7b9630 100644
--- a/_includes/consoleVersionSelect.html
+++ b/_includes/consoleVersionSelect.html
@@ -41,6 +41,7 @@
         <option>14</option>
         <option>15</option>
         <option>16</option>
+        <option>17</option>
     </select>.<select id="whydidnintendodecidetodothingslikethis">
       <option>0</option>
     </select>-<select id="nver">
@@ -94,6 +95,7 @@
         <option>47</option>
         <option>48</option>
         <option>49</option>
+        <option>50</option>
     </select><select id="region">
       <option>E</option>
       <option>U</option>
diff --git a/_pages/en_US/faq.txt b/_pages/en_US/faq.txt
index b0fea188c8..c3f9b867e0 100644
--- a/_pages/en_US/faq.txt
+++ b/_pages/en_US/faq.txt
@@ -3,6 +3,11 @@ title: "FAQ"
 ---
 {% include toc title="Table of Contents"%}
 
+{% capture update-notice %}
+{% include_relative include/3ds-11.17.txt %}
+{% endcapture %}
+<div class="notice--danger">{{ update-notice | markdownify }}</div>
+
 **Yes**, you can still install custom firmware on your 3DS, even after the closure of eShop.
 {: .notice--info}
 
diff --git a/_pages/en_US/home.txt b/_pages/en_US/home.txt
index 26709be631..f99e1f4276 100644
--- a/_pages/en_US/home.txt
+++ b/_pages/en_US/home.txt
@@ -14,6 +14,11 @@ excerpt: "A complete guide to 3DS (and 2DS) custom firmware, <br /> from stock t
 Thoroughly read all of the introductory pages (including this one!) before proceeding.
 {: .notice--info}
 
+{% capture update-notice %}
+{% include_relative include/3ds-11.17.txt %}
+{% endcapture %}
+<div class="notice--danger">{{ update-notice | markdownify }}</div>
+
 ## What is custom firmware?
 
 **Custom firmware** ("CFW") is a full software modification to your 3DS, comparable to "administrator access" on a computer. It allows you to do anything that the 3DS is physically capable of doing, rather than being limited by whatever Nintendo allows you to do.
diff --git a/_pages/en_US/include/3ds-11.17.txt b/_pages/en_US/include/3ds-11.17.txt
new file mode 100644
index 0000000000..c5eafd817a
--- /dev/null
+++ b/_pages/en_US/include/3ds-11.17.txt
@@ -0,0 +1,5 @@
+**3DS firmware 11.17.0 was recently released**. Here's what you should know:
+
+- If your device is running *Luma 11.0*, it is *100% safe* to update. You can check your Luma version by holding (Select) while booting your device.
+- If your device is on an older Luma version, you should [update Luma](checking-for-cfw) before you update your device to 11.17.0.
+- If your device does not yet have custom firmware, **do NOT update to the latest version**, as you will not be able to hack your console.
diff --git a/assets/js/selecting.js b/assets/js/selecting.js
index c5ac5e300a..e41d4840ed 100644
--- a/assets/js/selecting.js
+++ b/assets/js/selecting.js
@@ -70,6 +70,8 @@ function sslothablekor(s, n, o) {
     - N3DS & 11.16:
         - super-skaterhax, compatible with 11.15 - 11.16 but browser itself doesn't work on 11.15
         - This way N3DS users don't have to think too much about the slightly long Seedminer steps
+    - 11.17: 
+        - unhackable
 */
 function redirect() {
     var major = document.getElementById("major");
@@ -87,6 +89,9 @@ function redirect() {
     else if (major.value == 0) {
         document.getElementById("result_invalidVersion").style.display = "block";
     }
+    else if (major.value == 11 && minor.value == 17) {
+        document.getElementById("result_methodUnavailable").style.display = "block";
+    }
     // only do things if major isnt 0, which would be invalid
     else {
         // USA/EUR/JPN things