diff --git a/.gitignore b/.gitignore
index b345f22..9c6ffb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@
 /notebook-5.2.1.tar.gz
 /notebook-5.3.0rc1.tar.gz
 /notebook-5.3.0.tar.gz
+/notebook-5.3.1.tar.gz
+/notebook-5.4.0.tar.gz
diff --git a/python-notebook-nbsphinx-notexecute.patch b/python-notebook-nbsphinx-notexecute.patch
new file mode 100644
index 0000000..fa5b537
--- /dev/null
+++ b/python-notebook-nbsphinx-notexecute.patch
@@ -0,0 +1,41 @@
+From 6453b0f1dae36306feb3fb384bd959f4db0d1b39 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+Date: Wed, 21 Feb 2018 16:46:33 +0100
+Subject: [PATCH] Do not execute special notebooks with nbsphinx
+
+They can hang in headless environment.
+
+See also db90e16d17acc778efdfff6dca69767b47b60cbd
+---
+ docs/source/examples/Notebook/Connecting with the Qt Console.ipynb | 3 +++
+ docs/source/examples/Notebook/Custom Keyboard Shortcuts.ipynb      | 3 +++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/docs/source/examples/Notebook/Connecting with the Qt Console.ipynb b/docs/source/examples/Notebook/Connecting with the Qt Console.ipynb
+index eb82a21df1..4794200413 100644
+--- a/docs/source/examples/Notebook/Connecting with the Qt Console.ipynb	
++++ b/docs/source/examples/Notebook/Connecting with the Qt Console.ipynb	
+@@ -104,6 +104,9 @@
+   }
+  ],
+  "metadata": {
++  "nbsphinx": {
++   "execute": "never"
++  },
+   "kernelspec": {
+    "display_name": "Python 3",
+    "language": "python",
+diff --git a/docs/source/examples/Notebook/Custom Keyboard Shortcuts.ipynb b/docs/source/examples/Notebook/Custom Keyboard Shortcuts.ipynb
+index 3239a4f243..64576268d2 100644
+--- a/docs/source/examples/Notebook/Custom Keyboard Shortcuts.ipynb	
++++ b/docs/source/examples/Notebook/Custom Keyboard Shortcuts.ipynb	
+@@ -131,6 +131,9 @@
+   }
+  ],
+  "metadata": {
++  "nbsphinx": {
++   "execute": "never"
++  },
+   "kernelspec": {
+    "display_name": "Python 3",
+    "language": "python",
diff --git a/python-notebook.spec b/python-notebook.spec
index 05591bf..348ffb9 100644
--- a/python-notebook.spec
+++ b/python-notebook.spec
@@ -4,7 +4,7 @@ Name:           python-%{pypi_name}
 %global _docdir_fmt %{name}
 
 # Updating this package? Update the list of bundled things bellow (twice)
-Version:        5.3.0
+Version:        5.4.0
 
 # a tag like rc1, set to %%{nil} if stable
 %global tag %{nil}
@@ -12,12 +12,15 @@ Version:        5.3.0
 # upstream version, like 1.2.3rc1
 %global uversion %{version}%{tag}
 
-Release:        2%{tag}%{?dist}
+Release:        1%{tag}%{?dist}
 Summary:        A web-based notebook environment for interactive computing
 License:        BSD
 URL:            http://jupyter.org
 Source0:        https://files.pythonhosted.org/packages/source/n/%{pypi_name}/%{pypi_name}-%{uversion}.tar.gz
 
+# https://github.com/jupyter/notebook/pull/3360
+Patch0:         %{name}-nbsphinx-notexecute.patch
+
 BuildArch:      noarch
 
 BuildRequires:  python2-setuptools
@@ -250,6 +253,9 @@ LANG=C.utf-8 nosetests-3 -v
 %license COPYING.md
 
 %changelog
+* Wed Feb 21 2018 Miro Hrončok <mhroncok@redhat.com> - 5.4.0-1
+- Update to 5.4.0 (#1535263)
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.3.0-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index 12d9c67..1ce42a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (notebook-5.3.0.tar.gz) = f9ea9ed4b3d0e6e76701a9c7c99d8a4b2a30f35096547fb64b6fac7680f290fdd051b63868dfaafe93bfef5adace088cab6fc2f0e11911c564604ee137773fe9
+SHA512 (notebook-5.4.0.tar.gz) = 9603277020081e079779892d24a3e037419ca1c0b2fb9d3dfe77e5414a822dddfe50027b437961084cf7378f4bcda414c10f0714970a83e4fcf33d9d9905c9d6