diff --git a/component.xml b/component.xml
deleted file mode 100644
--- a/component.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<PISI>
-    <Name>programming.python</Name>
-</PISI>
-
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,24 +1,24 @@
 name       : pep8
-version    : 1.6.2
-release    : 3
+version    : 1.7.0
+release    : 4
 source     :
-    - https://pypi.python.org/packages/source/p/pep8/pep8-1.6.2.tar.gz : b8b7e35630b5539e26a197dfc6005be9e1e9a135496b377723a8ebc01b9bcbff
+    - https://pypi.python.org/packages/3e/b5/1f717b85fbf5d43d81e3c603a7a2f64c9f1dabc69a1e7745bd394cc06404/pep8-1.7.0.tar.gz : a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900
 license    : Expat
+component  : programming.python
 summary    : PEP8 compliance checking
 description: |
     PEP8 compliance checking
 builddeps  :
-    - pkgconfig(python-2.7)
     - pkgconfig(python-3.5)
     - python-setuptools
 rundeps    :
     - python-setuptools
 build      : |
-    python2 setup.py build
-    python3 setup.py build
+    %python3_setup
+    %python_setup
 install    : |
-    python2 setup.py install --root=%installroot% --no-compile -O0
-    mv $installdir/usr/bin/pep8 $installdir/usr/bin/pep8-2.7
-    python3 setup.py install --root=%installroot% --no-compile -O0
-    mv $installdir/usr/bin/pep8 $installdir/usr/bin/pep8-3.5
-    ln -sv pep8-2.7 $installdir/usr/bin/pep8
+    %python3_install
+    for _f in "$installdir"/usr/bin/*; do
+      mv -v "$_f" "${_f}-3"
+    done
+    %python_install
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,10 +2,11 @@
     <Source>
         <Name>pep8</Name>
         <Packager>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Ewan Paterson</Name>
+            <Email>ewan.paterson@hotmail.co.uk</Email>
         </Packager>
         <License>Expat</License>
+        <PartOf>programming.python</PartOf>
         <Summary xml:lang="en">PEP8 compliance checking</Summary>
         <Description xml:lang="en">PEP8 compliance checking
 </Description>
@@ -17,22 +18,35 @@
         <Description xml:lang="en">PEP8 compliance checking
 </Description>
         <PartOf>programming.python</PartOf>
-        <RuntimeDependencies>
-            <Dependency>python-setuptools</Dependency>
-        </RuntimeDependencies>
         <Files>
-            <Path fileType="library">/usr/lib/python2.7</Path>
-            <Path fileType="library">/usr/lib/python3.5</Path>
             <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/namespace_packages.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/not-zip-safe</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8-1.7.0-py2.7.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8.py</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/pep8.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/__pycache__/pep8.cpython-35.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/namespace_packages.txt</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/not-zip-safe</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8-1.7.0-py3.5.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python3.5/site-packages/pep8.py</Path>
         </Files>
     </Package>
     <History>
-        <Update release="3">
-            <Date>2016-02-03</Date>
-            <Version>1.6.2</Version>
+        <Update release="4">
+            <Date>2017-08-02</Date>
+            <Version>1.7.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Ikey Doherty</Name>
-            <Email>ikey@solus-project.com</Email>
+            <Name>Ewan Paterson</Name>
+            <Email>ewan.paterson@hotmail.co.uk</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file