diff --git a/.travis.yml b/.travis.yml
index 3ff110a..cc48347 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,8 @@ env:
   - TOX_ENV=py35-django18
   - TOX_ENV=py35-django111
   - TOX_ENV=py35-django20
-  - TOX_ENV=py35-djangomaster
+  - TOX_ENV=py35-django21
+  - TOX_ENV=py35-django22
 matrix:
   include:
     - env: TOX_ENV=py36-django18
@@ -21,6 +22,10 @@ matrix:
       python: "3.6"
     - env: TOX_ENV=py36-django20
       python: "3.6"
+    - env: TOX_ENV=py36-django21
+      python: "3.6"
+    - env: TOX_ENV=py36-django22
+      python: "3.6"
     - env: TOX_ENV=py36-djangomaster
       python: "3.6"
 install: pip install tox
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 068a482..ddca4c3 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,8 +4,9 @@ Changelog
 0.6.3 (unreleased)
 ------------------
 
-- Nothing changed yet.
-
+- Confirm compatibility with Django 2.2
+- Compatibility with Django 2.1 added.
+  From @tsouvarev work : https://github.com/python-babel/django-babel/pull/45
 
 0.6.2 (2017-12-18)
 ------------------
diff --git a/django_babel/extract.py b/django_babel/extract.py
index edb42c7..d3a82f9 100644
--- a/django_babel/extract.py
+++ b/django_babel/extract.py
@@ -1,5 +1,14 @@
 # -*- coding: utf-8 -*-
-from django.template.base import Lexer, TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+from django.template.base import Lexer
+try:
+    from django.template.base import TokenType
+except ImportError:  # django < 2.1
+    from django.template.base import TOKEN_TEXT, TOKEN_VAR, TOKEN_BLOCK
+else:
+    TOKEN_TEXT = TokenType.TEXT
+    TOKEN_VAR = TokenType.VAR
+    TOKEN_BLOCK = TokenType.BLOCK
+
 from django.utils.translation import trim_whitespace
 from django.utils.encoding import smart_text
 
diff --git a/tox.ini b/tox.ini
index e763d02..906e00f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,8 @@
 [tox]
-envlist = py{35,36}-djangomaster, py{27,34,35,36}-django{18,111,20}, lint, docs
+envlist = py{27,35,36}-django{18,111},
+          py{35,36,37}-django{20,21,22},
+          py{36,37}-django{master},
+          lint, docs
 
 [testenv]
 deps =
@@ -11,6 +14,8 @@ deps =
     django18: Django>=1.8,<1.9
     django111: Django>=1.11,<2.0
     django20: Django>=2.0,<2.1
+    django21: Django>=2.1,<2.2
+    django22: Django>=2.2,<3
     djangomaster: https://github.com/django/django/archive/master.tar.gz#egg=Django
 commands = py.test {posargs}