diff --git a/srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch b/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch
similarity index 76%
rename from srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch
rename to srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch
index 36a816a8468..ed04e368280 100644
--- a/srcpkgs/python-tornado/patches/01_use-system-ca-certificates.patch
+++ b/srcpkgs/python-tornado/patches/0001-use-system-ca-certificates.patch
@@ -1,6 +1,4 @@
-diff --git setup.py setup.py
-index f09169f..d42c486 100644
---- setup.py
+--- setup.py.orig
 +++ setup.py
 @@ -120,7 +120,7 @@ if (platform.python_implementation() == 'CPython' and
          # Certifi is also optional on 2.7.9+, although making our dependencies
@@ -8,29 +6,27 @@ index f09169f..d42c486 100644
          # until we have more declarative metadata.
 -        install_requires.append('certifi')
 +        pass
-     kwargs['install_requires'] = install_requires
-
- setup(
-diff --git tornado/simple_httpclient.py tornado/simple_httpclient.py
-index f0f73fa..ffe3e40 100644
---- tornado/simple_httpclient.py
+     if sys.version_info < (3, 5):
+         install_requires.append('backports_abc>=0.4')
+ kwargs['install_requires'] = install_requires
+--- tornado/simple_httpclient.py.orig
 +++ tornado/simple_httpclient.py
 @@ -33,17 +33,9 @@ except ImportError:
      # ssl is not available on Google App Engine.
      ssl = None
-
+ 
 -try:
 -    import certifi
 -except ImportError:
 -    certifi = None
 -
-
+ 
  def _default_ca_certs():
 -    if certifi is None:
 -        raise Exception("The 'certifi' package is required to use https "
 -                        "in simple_httpclient")
 -    return certifi.where()
 +    return "/etc/ssl/certs/ca-certificates.crt"
-
-
+ 
+ 
  class SimpleAsyncHTTPClient(AsyncHTTPClient):
diff --git a/srcpkgs/python-tornado/patches/0002-no-backports.ssl_match_hostname.patch b/srcpkgs/python-tornado/patches/0002-no-backports.ssl_match_hostname.patch
new file mode 100644
index 00000000000..a34fe0b0c55
--- /dev/null
+++ b/srcpkgs/python-tornado/patches/0002-no-backports.ssl_match_hostname.patch
@@ -0,0 +1,11 @@
+--- setup.py.orig
++++ setup.py
+@@ -121,7 +121,7 @@ def build_extension(self, ext):
+     if sys.version_info < (2, 7):
+         # Only needed indirectly, for singledispatch.
+         install_requires.append('ordereddict')
+-    if sys.version_info < (3, 2):
++    if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
+         install_requires.append('backports.ssl_match_hostname')
+     if sys.version_info < (3, 4):
+         install_requires.append('singledispatch')
diff --git a/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch b/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch
deleted file mode 100644
index c985a3cc3ac..00000000000
--- a/srcpkgs/python-tornado/patches/02_no-backports.ssl-match-hostname.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git setup.py setup.py
-index f09169f..f795807 100644
---- setup.py
-+++ setup.py
-@@ -121,7 +121,7 @@ def build_extension(self, ext):
- if setuptools is not None:
-     # If setuptools is not available, you're on your own for dependencies.
-     install_requires = []
--    if sys.version_info < (3, 2):
-+    if sys.version_info < (2, 7, 9) or (3, 0) <= sys.version_info < (3, 2):
-         install_requires.append('backports.ssl_match_hostname')
-     kwargs['install_requires'] = install_requires
- 
-
diff --git a/srcpkgs/python-tornado/template b/srcpkgs/python-tornado/template
index 319c2d0f986..2dcc1cd2c30 100644
--- a/srcpkgs/python-tornado/template
+++ b/srcpkgs/python-tornado/template
@@ -1,31 +1,25 @@
 # Template file for 'python-tornado'
 pkgname=python-tornado
-reverts=4.3_1
-version=4.2.1
-revision=2
+version=4.3
+revision=1
 wrksrc="tornado-${version}"
 build_style=python-module
 python_versions="2.7 3.4"
+pycompile_module="tornado"
 hostmakedepends="python-setuptools python3.4-setuptools"
 makedepends="python-devel python3.4-devel"
-depends="ca-certificates"
-pycompile_module="tornado"
+depends="ca-certificates python-singledispatch python-backports_abc"
 short_desc="Python2 web framework and asynchronous networking library"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.tornadoweb.org/"
 license="Apache-2.0"
 distfiles="${PYPI_SITE}/t/tornado/tornado-${version}.tar.gz"
-checksum=a16fcdc4f76b184cb82f4f9eaeeacef6113b524b26a2cb331222e4a7fa6f2969
-
-pre_build() {
-	# remove shebang
-	sed -i '/^#!\//,1d' tornado/*.py tornado/*/*.py
-}
+checksum=c9c2d32593d16eedf2cec1b6a41893626a2649b40b21ca9c4cac4243bde2efbf
 
 python3.4-tornado_package() {
-	depends="ca-certificates"
 	pycompile_version="3.4"
 	pycompile_module="tornado"
+	depends="ca-certificates python3.4-backports_abc"
 	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
 		vmove usr/lib/python3.4