diff --git a/package/python-tornado/0001-Disable-SSL-checks.patch b/package/python-tornado/0001-Disable-SSL-checks.patch
new file mode 100644
index 0000000000..33cfc6b0ef
--- /dev/null
+++ b/package/python-tornado/0001-Disable-SSL-checks.patch
@@ -0,0 +1,44 @@
+From 82a3bbc2ac41b5a1b34a53f97459558efe131f14 Mon Sep 17 00:00:00 2001
+From: Jan Dohl <polygon@wh2.tu-dresden.de>
+Date: Sun, 24 Jun 2018 16:00:54 +0200
+Subject: [PATCH] Disable SSL checks
+
+Checking for SSL support in the Python used on the build system is not
+relevant, as we need SSL support in the Python on the target system.
+
+Signed-off-by: Jan Dohl <polygon@wh2.tu-dresden.de>
+---
+ setup.py | 11 -----------
+ 1 file changed, 11 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 6fbb10a8..1a9220c7 100644
+--- a/setup.py
++++ b/setup.py
+@@ -15,7 +15,6 @@
+ 
+ import os
+ import platform
+-import ssl
+ import sys
+ import warnings
+ 
+@@ -137,16 +136,6 @@ if setuptools is not None:
+     python_requires = '>= 2.7, !=3.0.*, !=3.1.*, !=3.2.*, != 3.3.*'
+     kwargs['python_requires'] = python_requires
+ 
+-# Verify that the SSL module has all the modern upgrades. Check for several
+-# names individually since they were introduced at different versions,
+-# although they should all be present by Python 3.4 or 2.7.9.
+-if (not hasattr(ssl, 'SSLContext') or
+-        not hasattr(ssl, 'create_default_context') or
+-        not hasattr(ssl, 'match_hostname')):
+-    raise ImportError("Tornado requires an up-to-date SSL module. This means "
+-                      "Python 2.7.9+ or 3.4+ (although some distributions have "
+-                      "backported the necessary changes to older versions).")
+-
+ setup(
+     name="tornado",
+     version=version,
+-- 
+2.14.4
diff --git a/package/python-tornado/Config.in b/package/python-tornado/Config.in
index e1bf8343f0..1afbdc5729 100644
--- a/package/python-tornado/Config.in
+++ b/package/python-tornado/Config.in
@@ -1,8 +1,12 @@
 config BR2_PACKAGE_PYTHON_TORNADO
 	bool "python-tornado"
-	depends on BR2_PACKAGE_PYTHON3
-	select BR2_PACKAGE_PYTHON3_ZLIB
-	select BR2_PACKAGE_PYTHON3_SSL
+	select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON_SINGLEDISPATCH if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_BACKPORTS_ABC	if BR2_PACKAGE_PYTHON # runtime
+	select BR2_PACKAGE_PYTHON_CERTIFI if BR2_PACKAGE_PYTHON # runtime
 	help
 	  Tornado is a Python web framework and asynchronous networking
 	  library, originally developed at FriendFeed.
diff --git a/package/python-tornado/python-tornado.hash b/package/python-tornado/python-tornado.hash
index e9fbbedf65..fbf5efa60a 100644
--- a/package/python-tornado/python-tornado.hash
+++ b/package/python-tornado/python-tornado.hash
@@ -1,5 +1,5 @@
 # md5, sha256 from https://pypi.org/pypi/tornado/json
-md5  cf39425f3d7eba9a54287f3e795a2f23  tornado-6.0.4.tar.gz
-sha256  0fe2d45ba43b00a41cd73f8be321a44936dc1aba233dee979f17a042b83eb6dc  tornado-6.0.4.tar.gz
+md5	a1ce4f392d30ff0ebcb255150d89b826  tornado-5.1.1.tar.gz
+sha256	4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409  tornado-5.1.1.tar.gz
 # Locally computed sha256 checksums
-sha256  3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5  LICENSE
+sha256	cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/python-tornado/python-tornado.mk b/package/python-tornado/python-tornado.mk
index 15f3b83689..71f536f023 100644
--- a/package/python-tornado/python-tornado.mk
+++ b/package/python-tornado/python-tornado.mk
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-PYTHON_TORNADO_VERSION = 6.0.4
+PYTHON_TORNADO_VERSION = 5.1.1
 PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz
-PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/95/84/119a46d494f008969bf0c775cb2c6b3579d3c4cc1bb1b41a022aa93ee242
+PYTHON_TORNADO_SITE = https://files.pythonhosted.org/packages/e6/78/6e7b5af12c12bdf38ca9bfe863fcaf53dc10430a312d0324e76c1e5ca426
 PYTHON_TORNADO_LICENSE = Apache-2.0
 PYTHON_TORNADO_LICENSE_FILES = LICENSE
 PYTHON_TORNADO_SETUP_TYPE = setuptools