diff --git a/python-elasticsearch.spec b/python-elasticsearch.spec
index a674f89..ff3dc63 100644
--- a/python-elasticsearch.spec
+++ b/python-elasticsearch.spec
@@ -3,7 +3,7 @@
 
 Name:           python-elasticsearch
 Version:        2.3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Client for Elasticsearch
 
 License:        ASL 2.0
@@ -59,28 +59,19 @@ for all Elasticsearch-related code in Python. The client's features include:
 %setup -qn %{tarball_name}-%{version}
 rm -fr %{tarball_name}.egg-info
 
-%if %{with python3}
-rm -rf %{py3dir}
-cp -a . %{py3dir}
-%endif
-
 %build
-%{__python2} setup.py build
+%py2_build
 
 %if %{with python3}
-pushd %{py3dir}
-%{__python3} setup.py build
-popd
+%py3_build
 %endif
 
 %install
 %if %{with python3}
-pushd %{py3dir}
-%{__python3} setup.py install -O1 --skip-build --root %{buildroot}
-popd
+%py3_install
 %endif
 
-%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+%py2_install
 
 %files
 %{python2_sitelib}/%{tarball_name}
@@ -97,10 +88,13 @@ popd
 %endif
 
 %changelog
-* Wed Jun 08 2016 Piotr Popieluch <piotr1212@gmail.com> - - 2.3.0-1
+* Wed Jun 25 2016 Orion Poplawski <orion@cora.nwra.com> - 2.3.0-2
+- Drop %%py3dir and use new macros
+
+* Wed Jun 08 2016 Piotr Popieluch <piotr1212@gmail.com> - 2.3.0-1
 - Update to 2.3.0
 
-* Wed Jun 08 2016 Piotr Popieluch <piotr1212@gmail.com> - - 2.0.0-4
+* Wed Jun 08 2016 Piotr Popieluch <piotr1212@gmail.com> - 2.0.0-4
 - Readd python-rullib dependency, rpmlint Error needs to be ignored #1344121
 
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-3