diff --git a/.gitignore b/.gitignore
index 00788fa..ca16228 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /3.1.tar.gz
 /3.2.tar.gz
 /Chameleon-3.4.tar.gz
+/Chameleon-3.6.1.tar.gz
diff --git a/python-chameleon-loosen-deps.patch b/python-chameleon-loosen-deps.patch
deleted file mode 100644
index b8d11d9..0000000
--- a/python-chameleon-loosen-deps.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up Chameleon-1.2.12/setup.py.bak Chameleon-1.2.12/setup.py
---- Chameleon-1.2.12/setup.py.bak	2010-09-16 23:21:20.886604103 -0400
-+++ Chameleon-1.2.12/setup.py	2010-09-16 23:21:36.414606323 -0400
-@@ -45,9 +45,9 @@ setup(name="Chameleon",
-           'i18nize' : [ "lxml", ],
-           },
-       tests_require=install_requires + [
--          'zope.interface==3.5.2',
--          'zope.component==3.7.1',
--          'zope.i18n==3.7.1',
-+          'zope.interface>=3.5.2',
-+          'zope.component>=3.7.1',
-+          'zope.i18n>=3.7.1',
-           'lxml',
-           ],
-       test_suite="chameleon.tests",
diff --git a/python-chameleon-py27.patch b/python-chameleon-py27.patch
deleted file mode 100644
index d98dee5..0000000
--- a/python-chameleon-py27.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: Chameleon-1.2.12/src/chameleon/genshi/language.txt
-===================================================================
---- Chameleon-1.2.12.orig/src/chameleon/genshi/language.txt
-+++ Chameleon-1.2.12/src/chameleon/genshi/language.txt
-@@ -599,7 +599,7 @@ validate
-   ... </html>""", data=Markup("<em>incorrect<em>"))
-   Traceback (most recent call last):
-    ...
--  ValidationError: Insertion of u'<em>incorrect<em>' is not allowed.
-+  ParseError: mismatched tag: line 1, column 7266
-   
-   >>> config.VALIDATION = False
-   
-Index: Chameleon-1.2.12/src/chameleon/zpt/language.txt
-===================================================================
---- Chameleon-1.2.12.orig/src/chameleon/zpt/language.txt
-+++ Chameleon-1.2.12/src/chameleon/zpt/language.txt
-@@ -747,7 +747,7 @@ validate
-   ... </html>""", data=Markup("<em>incorrect<em>"))
-   Traceback (most recent call last):
-    ...
--  ValidationError: Insertion of u'<em>incorrect<em>' is not allowed.
-+  ParseError: mismatched tag: line 1, column 7266
- 
-   >>> config.VALIDATION = False
- 
diff --git a/python-chameleon.spec b/python-chameleon.spec
index 8dbfe2a..e9bbee6 100644
--- a/python-chameleon.spec
+++ b/python-chameleon.spec
@@ -1,9 +1,3 @@
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2:        %global __python2 /usr/bin/python2}
-%{!?python2_sitelib:  %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
-
 %if 0%{?fedora} || 0%{?rhel} >= 8
 %global with_python3 1
 %endif
@@ -11,8 +5,8 @@
 %global srcname Chameleon
 
 Name:           python-chameleon
-Version:        3.4
-Release:        2%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        XML-based template compiler
 
 License:        BSD
@@ -38,11 +32,6 @@ BuildRequires:  python3-zope-interface
 BuildRequires:  python-unittest2
 %endif
 
-%if 0%{?rhel} && 0%{?rhel} < 6
-BuildRequires:  python-elementtree
-BuildRequires:  python-ordereddict
-%endif
-
 %global _description\
 Chameleon is an XML attribute language template compiler. It comes with\
 implementations for the Zope Page Templates (ZPT) and Genshi templating\
@@ -56,10 +45,6 @@ use run-time interpretation.
 
 %package -n python2-chameleon
 Summary: %summary
-%if 0%{?rhel} && 0%{?rhel} < 6
-Requires:       python-elementtree
-Requires:       python-ordereddict
-%endif
 Requires: python2-setuptools
 Requires: python2-zope-interface
 Requires: python2-lxml
@@ -98,6 +83,10 @@ Requires:   python3-lxml
 rm -rf  %{buildroot}%{python2_sitelib}/chameleon/tests
 # Data files for the tests
 find %{buildroot}%{python2_sitelib}/chameleon -name '*.txt' -exec rm \{\} \;
+%if 0%{?with_python3}
+rm -rf  %{buildroot}%{python3_sitelib}/chameleon/tests
+find %{buildroot}%{python3_sitelib}/chameleon -name '*.txt' -exec rm \{\} \;
+%endif
 
 %check
 %{__python2} setup.py test
@@ -119,6 +108,9 @@ find %{buildroot}%{python2_sitelib}/chameleon -name '*.txt' -exec rm \{\} \;
 %endif
 
 %changelog
+* Tue Apr 09 2019 Miro Hrončok <mhroncok@redhat.com> - 3.6.1-1
+- Update to 3.6.1 (#1678778)
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 71f5118..616b91c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Chameleon-3.4.tar.gz) = 107a7bc7a896175deedb24bf67356fc5866b68212ac2c5073a8197486a10ab480ec832fd808c9199633ef9d5943dbe0532985d3f1eb4f05e48280ed753e3780c
+SHA512 (Chameleon-3.6.1.tar.gz) = 722c83a26b24902d2316451b65d03ccc79a0aab6116b067341e3a97a140ff30cc1f3a4ba976413823925f0037978d5329b6f0e8e386b61288ef9af5191fb6b2e