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,23 @@
+name       : python-three-merge
+version    : 0.1.1
+release    : 1
+source     :
+    - https://github.com/spyder-ide/three-merge/archive/v0.1.1.tar.gz : b6ab2231fd349cdf03be5be04f28c1d59d5a475f7396dcf8fd8b0597981d113e
+homepage   : https://github.com/spyder-ide/three-merge
+license    : MIT
+component  : programming.python
+summary    : Simple Python library to perform a 3-way merge between strings
+description: |
+    Simple Python library to perform a 3-way merge between strings, based on diff-match-patch. This library performs merges at a character level, as opposed to most VCS systems, which opt for a line-based approach.
+builddeps  :
+    - python-diff-match-patch
+    - python-pytest
+rundeps    :
+    - python-diff-match-patch
+build      : |
+    %python3_setup
+install    : |
+    %python3_install
+check      : |
+    %python3_test pytest3 -v
+   
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,47 @@
+<PISI>
+    <Source>
+        <Name>python-three-merge</Name>
+        <Homepage>https://github.com/spyder-ide/three-merge</Homepage>
+        <Packager>
+            <Name>Algent Albrahimi</Name>
+            <Email>algent@protonmail.com</Email>
+        </Packager>
+        <License>MIT</License>
+        <PartOf>programming.python</PartOf>
+        <Summary xml:lang="en">Simple Python library to perform a 3-way merge between strings</Summary>
+        <Description xml:lang="en">Simple Python library to perform a 3-way merge between strings, based on diff-match-patch. This library performs merges at a character level, as opposed to most VCS systems, which opt for a line-based approach.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>python-three-merge</Name>
+        <Summary xml:lang="en">Simple Python library to perform a 3-way merge between strings</Summary>
+        <Description xml:lang="en">Simple Python library to perform a 3-way merge between strings, based on diff-match-patch. This library performs merges at a character level, as opposed to most VCS systems, which opt for a line-based approach.
+</Description>
+        <PartOf>programming.python</PartOf>
+        <Files>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge-0.1.1-py3.7.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge-0.1.1-py3.7.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge-0.1.1-py3.7.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge-0.1.1-py3.7.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge-0.1.1-py3.7.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/__pycache__/merge.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/merge.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/tests/__init__.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/tests/__pycache__/__init__.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/tests/__pycache__/test_merge.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/three_merge/tests/test_merge.py</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2020-11-09</Date>
+            <Version>0.1.1</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Algent Albrahimi</Name>
+            <Email>algent@protonmail.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file