diff --git a/lib/linguist/languages.yml b/lib/linguist/languages.yml
index 6b2801ff..937b971c 100644
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -1694,6 +1694,17 @@ Julia:
   color: "#a270ba"
   ace_mode: julia
 
+ Jupyter Notebook:
+  type: programming
+  ace_mode: json
+  color: "#F37626"
+  extensions:
+  - .ipynb
+  filenames:
+  - Notebook
+  aliases:
+  - IPython Notebook
+
 KRL:
   type: programming
   color: "#28431f"
@@ -2783,7 +2794,6 @@ Python:
   - .tac
   - .wsgi
   - .xpy
-  - .ipynb
   filenames:
   - BUILD
   - SConscript
diff --git a/samples/Python/JupyterNotebook.ipynb b/samples/Jupyter-Notebook/JupyterNotebook.ipynb
similarity index 100%
rename from samples/Python/JupyterNotebook.ipynb
rename to samples/Jupyter-Notebook/JupyterNotebook.ipynb