diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,32 @@
+name       : autopep8
+version    : 1.3.5
+release    : 1
+source     :
+    - https://github.com/hhatto/autopep8/archive/v1.3.5.tar.gz : 45938f23d725f17f41477878aa423c7a8bcd5374df65f55d0a4b53a1da9477ae
+license    : MIT
+component  : programming.python
+summary    : Python auto formatting tool.
+description: |
+    A tool that automatically formats Python code to conform to the PEP 8 style guide.
+builddeps  :
+    - pkgconfig(python3)
+    - python-setuptools
+    - pycodestyle
+rundeps    :
+    - pycodestyle
+build      : |
+    %python3_setup
+    %python_setup
+install    : |
+    %python3_install
+    for _f in $installdir/usr/bin/*; do
+        mv -v $_f ${_f}3
+    done
+    %python_install
+check      : |
+    pushd $PKG_BUILD_DIR/py2build/test
+        python test_autopep8.py
+    popd
+    pushd $PKG_BUILD_DIR/py3build/test
+        python3 test_autopep8.py
+    popd
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,52 @@
+<PISI>
+    <Source>
+        <Name>autopep8</Name>
+        <Packager>
+            <Name>James Lee</Name>
+            <Email>jamesl33info@gmail.com</Email>
+        </Packager>
+        <License>MIT</License>
+        <PartOf>programming.python</PartOf>
+        <Summary xml:lang="en">Python auto formatting tool.</Summary>
+        <Description xml:lang="en">A tool that automatically formats Python code to conform to the PEP 8 style guide.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>autopep8</Name>
+        <Summary xml:lang="en">Python auto formatting tool.</Summary>
+        <Description xml:lang="en">A tool that automatically formats Python code to conform to the PEP 8 style guide.
+</Description>
+        <PartOf>programming.python</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/not-zip-safe</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8-1.3.5-py2.7.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8.py</Path>
+            <Path fileType="library">/usr/lib/python2.7/site-packages/autopep8.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/__pycache__/autopep8.cpython-36.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/entry_points.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/not-zip-safe</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8-1.3.5-py3.6.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python3.6/site-packages/autopep8.py</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2018-05-08</Date>
+            <Version>1.3.5</Version>
+            <Comment>Packaging update</Comment>
+            <Name>James Lee</Name>
+            <Email>jamesl33info@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file