diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec
index 9ba2a69..7feffe4 100644
--- a/WALinuxAgent.spec
+++ b/WALinuxAgent.spec
@@ -1,17 +1,12 @@
-%global commit 5bb9df7f2f485dbd5be057bbb657afe54bc1bf1b
-
-%global distro fedora
-%global initsys systemd
-
 Name:           WALinuxAgent
-Version:        2.0.18
-Release:        5%{?dist}
+Version:        2.2.25
+Release:        1%{?dist}
 Summary:        The Microsoft Azure Linux Agent
 
 Group:          System Environment/Daemons
 License:        ASL 2.0
 URL:            https://github.com/Azure/%{name}
-Source0:        https://github.com/Azure/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
+Source0:        https://github.com/Azure/%{name}/archive/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
 
@@ -35,23 +30,40 @@ The Microsoft Azure Linux Agent supports the provisioning and running of Linux
 VMs in the Microsoft Azure cloud. This package should be installed on Linux disk
 images that are built to run in the Microsoft Azure environment.
 
+%package legacy
+Summary:        The Microsoft Azure Linux Agent (legacy)
+Group:          System Environment/Daemons
+Requires:	%name = %version-%release
+Requires:	python2
+
+%description legacy
+The Microsoft Azure Linux Agent supporting old version of extensions.
+
 %prep
-%setup -qn %{name}-%{commit}
+%setup -q
 
 %build
-%{__python3} setup.py build
+%py3_build
 
 %install
-%{__python3} setup.py install --skip-build --root %{buildroot} --lnx-distro '%{distro}' --init-system '%{initsys}'
+%{__python3} setup.py install -O1 --skip-build --root %{buildroot} --lnx-distro redhat
 
 mkdir -p -m 0700 %{buildroot}%{_sharedstatedir}/waagent
 mkdir -p %{buildroot}%{_localstatedir}/log
 touch %{buildroot}%{_localstatedir}/log/waagent.log
 
 mkdir -p %{buildroot}%{_udevrulesdir}
-mv %{buildroot}%{_sysconfdir}/udev/rules.d/99-azure-product-uuid.rules %{buildroot}%{_udevrulesdir}/99-azure-product-uuid.rules
+mv %{buildroot}%{_sysconfdir}/udev/rules.d/*.rules %{buildroot}%{_udevrulesdir}/
 
-mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+rm -rf %{buildroot}/%{python3_sitelib}/tests
+rm -rf %{buildroot}/%{python3_sitelib}/__main__.py
+rm -rf %{buildroot}/%{python3_sitelib}/__pycache__/__main__*.py*
+
+sed -i 's,#!/usr/bin/env python,#!/usr/bin/python3,' %{buildroot}%{_sbindir}/waagent
+sed -i 's,#!/usr/bin/env python,#!/usr/bin/python2,' %{buildroot}%{_sbindir}/waagent2.0
+sed -i 's,/usr/bin/python ,/usr/bin/python3 ,' %{buildroot}%{_unitdir}/waagent.service
+
+mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent.logrotate %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
 
 %post
 %systemd_post waagent.service
@@ -63,16 +75,27 @@ mv %{buildroot}%{_sysconfdir}/logrotate.d/waagent %{buildroot}%{_sysconfdir}/log
 %systemd_postun_with_restart waagent.service
 
 %files
-%doc Changelog LICENSE-2.0.txt NOTICE README
+%doc Changelog LICENSE.txt NOTICE README.md
 %ghost %{_localstatedir}/log/waagent.log
 %dir %attr(0700, root, root) %{_sharedstatedir}/waagent
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_sbindir}/waagent
 %config(noreplace) %{_sysconfdir}/waagent.conf
+%{_udevrulesdir}/66-azure-storage.rules
 %{_udevrulesdir}/99-azure-product-uuid.rules
 %{_unitdir}/waagent.service
+%{python3_sitelib}/azurelinuxagent
+%{python3_sitelib}/%{name}-%{version}-py?.?.egg-info
+
+%files legacy
+%{_sbindir}/waagent2.0
 
 %changelog
+* Mon Apr 16 2018 Vitaly Kuznetsov <vkuznets@redhat.com> - 2.2.25-1
+- Update to 2.2.25
+- Switch to Python3
+- Legacy subpackage with waagent2.0 supporting old extensions
+
 * Wed Feb 28 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.0.18-5
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)