diff --git a/.gitignore b/.gitignore
index b00b7e6..f2436b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,3 +74,4 @@
 /pcs-0.10.6.tar.gz
 /pcs-web-ui-0.1.3.tar.gz
 /pcs-web-ui-node-modules-0.1.3.tar.xz
+/pcs-0.10.7.tar.gz
diff --git a/pcs.spec b/pcs.spec
index d3ffbc7..85f9e2c 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,9 +1,9 @@
 Name: pcs
-Version: 0.10.6
-Release: 2%{?dist}
+Version: 0.10.7
+Release: 1%{?dist}
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
-# MIT: handlebars
+# MIT: ember, handlebars, jquery, jquery-ui
 License: GPLv2 and MIT
 URL: https://github.com/ClusterLabs/pcs
 Summary: Pacemaker Configuration System
@@ -21,6 +21,12 @@ Summary: Pacemaker Configuration System
 %global pyagentx_version 0.4.pcs.2
 %global dacite_version 1.5.1
 
+# bundled libraries for old web-ui
+%global ember_version 1.4.0
+%global jquery_version 1.9.1
+%global jquery_ui_version 1.10.1
+%global handlebars_version 1.2.1
+
 # We do not use _libdir macro because upstream is not prepared for it.
 # Pcs does not include binaries and thus it should live in /usr/lib. Tornado
 # and gems include binaries and thus it should live in /usr/lib64. But the
@@ -49,9 +55,11 @@ BuildRequires: git
 BuildRequires: coreutils
 # python for pcs
 BuildRequires: python3 >= 3.6
+BuildRequires: python3-dateutil >= 2.7.0
 BuildRequires: python3-devel
 BuildRequires: python3-setuptools
 BuildRequires: python3-pycurl
+BuildRequires: python3-pyparsing
 BuildRequires: python3-tornado
 # ruby and gems for pcsd
 BuildRequires: ruby >= 2.2.0
@@ -86,10 +94,11 @@ BuildRequires: npm
 
 # python and libraries for pcs, setuptools for pcs entrypoint
 Requires: python3 >= 3.6
+Requires: python3-dateutil >= 2.7.0
 Requires: python3-lxml
 Requires: python3-setuptools
-Requires: python3-clufter => 0.70.0
 Requires: python3-pycurl
+Requires: python3-pyparsing
 Requires: python3-tornado
 # ruby and gems for pcsd
 Requires: ruby >= 2.2.0
@@ -130,6 +139,10 @@ Requires: liberation-sans-fonts
 Requires: overpass-fonts
 
 Provides: bundled(dacite) = %{dacite_version}
+Provides: bundled(ember) = %{ember_version}
+Provides: bundled(handlebars) = %{handlebars_version}
+Provides: bundled(jquery) = %{jquery_version}
+Provides: bundled(jquery-ui) = %{jquery_ui_version}
 
 %description
 pcs is a corosync and pacemaker configuration tool.  It permits users to
@@ -381,6 +394,12 @@ remove_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Wed Sep 30 2020 Miroslav Lisik <mlisik@redhat.com> - 0.10.7-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Added dependency on python packages pyparsing and dateutil
+- Fixed virtual bundle provides for ember, handelbars, jquery and jquery-ui
+- Removed dependency on python3-clufter
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 01ac62a..d1b83c1 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a
 SHA512 (dacite-1.5.1.tar.gz) = ac1a3ffcd7e75fe99e6a3baf8623d3caee8940f0d2a8e455f86d71f71e1ff76b0bfad0c112a2ebdf2a81d4be9c9bd99adea94603f674c28e68959cb299d0039d
-SHA512 (pcs-0.10.6.tar.gz) = e2e4ddc100a93d97ba8ecda1d3b4aa75f7a88be1f8aa9cc3de72cf67268b679f34007374129781cfc2567f091e472c3fa7a83e15037d68a3ea47edabcfd0b0ad
 SHA512 (pcs-web-ui-0.1.3.tar.gz) = caf28046e11d75f77ab96ab27fe3eb8b09bf767a0daee0155dbc7999ede2ae80f937328cc7fd6c0620caafbb6fda61d8076ec30ed2e2911fbf5dc6a0e1eb915b
 SHA512 (pcs-web-ui-node-modules-0.1.3.tar.xz) = 61cb28e7a6fe1253da24537101d502b3116d148db6eb81512067a0d6bdbafb7a93e3c546fb020515921ee846254be20dabbab79198c6e9bcfc3a18e7ebb5fdca
+SHA512 (pcs-0.10.7.tar.gz) = c76a11fa162258ee311dcceca50674d7638396880596a826a711d944aab421ed06a6c4eb41f9dc997c01b72bce73c98c4f7be3fcd8fafb8ae16902f6a1e0c521