diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/abi_used_libs b/abi_used_libs
new file mode 100644
--- /dev/null
+++ b/abi_used_libs
@@ -0,0 +1,10 @@
+libassuan.so.0
+libc.so.6
+libdevmapper.so.1.02
+libgio-2.0.so.0
+libglib-2.0.so.0
+libgobject-2.0.so.0
+libgpg-error.so.0
+libgpgme.so.11
+libostree-1.so.1
+libpthread.so.0
diff --git a/files/registries.conf.patch b/files/registries.conf.patch
new file mode 100644
--- /dev/null
+++ b/files/registries.conf.patch
@@ -0,0 +1,11 @@
+--- registries.conf
++++ registries.conf
+@@ -9,7 +9,7 @@
+ # Registries to search for images that are not fully-qualified.
+ # i.e. foobar.com/my_image:latest vs my_image:latest
+ [registries.search]
+-registries = []
++registries = ['docker.io', 'gcr.io', 'quay.io', 'registry.fedoraproject.org', 'registry.access.redhat.com', 'registry.centos.org']
+ 
+ # Registries that do not use TLS when pulling images or uses self-signed
+ # certificates.
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,38 @@
+name       : skopeo
+version    : 0.1.39
+release    : 1
+source     :
+    - git|https://github.com/containers/skopeo : v0.1.39
+    # we need these extra sources so we can grab configs to package them
+    # these are vendored with skopeo but are missing configs we need
+    # lookup correct versions in go.mod
+    - git|https://github.com/containers/image : v3.0.1
+    - git|https://github.com/containers/storage : v1.13.0
+license    : Apache-2.0
+component  : virt
+summary    : Work with remote OCI images registries - retrieving information, images, signing content
+description: |
+    Skopeo works with API V2 registries such as Docker registries, the Atomic registry, private registries, local directories and local OCI-layout directories. Skopeo does not require a daemon to be running to perform these operations.
+builddeps  :
+    - pkgconfig(devmapper)
+    - pkgconfig(gpgme)
+    - pkgconfig(ostree-1)
+    - btrfs-progs-devel
+    - golang
+    - go-md2man
+environment: |
+    export BUILDTAGS="containers_image_ostree_stub ostree"
+build      : |
+    %make binary-local BUILDTAGS="$BUILDTAGS"
+    %make docs
+install    : |
+    %make_install
+
+    install -m644 $sources/storage.git/storage.conf -t "$installdir/etc/containers/"
+    install -m644 $sources/image.git/registries.conf -t "$installdir/etc/containers/"
+    %patch -d $installdir/etc/containers/ < $pkgfiles/registries.conf.patch
+
+    install -d "$installdir/usr/share/man/man5/"
+    go-md2man -in "$sources/storage.git/docs/containers-storage.conf.5.md" -out "$installdir/usr/share/man/man5/containers-storage.conf.5"
+    go-md2man -in "$sources/image.git/docs/containers-registries.conf.5.md" -out "$installdir/usr/share/man/man5/containers-registries.conf.5"
+    go-md2man -in "$sources/image.git/docs/containers-policy.json.5.md" -out "$installdir/usr/share/man/man5/containers-policy.conf.5"
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,50 @@
+<PISI>
+    <Source>
+        <Name>skopeo</Name>
+        <Packager>
+            <Name>Mislav Čakarić</Name>
+            <Email>mcakaric@gmail.com</Email>
+        </Packager>
+        <License>Apache-2.0</License>
+        <PartOf>virt</PartOf>
+        <Summary xml:lang="en">Work with remote OCI images registries - retrieving information, images, signing content</Summary>
+        <Description xml:lang="en">Skopeo works with API V2 registries such as Docker registries, the Atomic registry, private registries, local directories and local OCI-layout directories. Skopeo does not require a daemon to be running to perform these operations.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>skopeo</Name>
+        <Summary xml:lang="en">Work with remote OCI images registries - retrieving information, images, signing content</Summary>
+        <Description xml:lang="en">Skopeo works with API V2 registries such as Docker registries, the Atomic registry, private registries, local directories and local OCI-layout directories. Skopeo does not require a daemon to be running to perform these operations.
+</Description>
+        <PartOf>virt</PartOf>
+        <Files>
+            <Path fileType="config">/etc/containers/policy.json</Path>
+            <Path fileType="config">/etc/containers/registries.conf</Path>
+            <Path fileType="config">/etc/containers/registries.d/default.yaml</Path>
+            <Path fileType="config">/etc/containers/storage.conf</Path>
+            <Path fileType="executable">/usr/bin/skopeo</Path>
+            <Path fileType="data">/usr/share/bash-completion/completions/skopeo</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo-copy.1</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo-delete.1</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo-inspect.1</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo-manifest-digest.1</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo-standalone-sign.1</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo-standalone-verify.1</Path>
+            <Path fileType="man">/usr/share/man/man1/skopeo.1</Path>
+            <Path fileType="man">/usr/share/man/man5/containers-policy.conf.5</Path>
+            <Path fileType="man">/usr/share/man/man5/containers-registries.conf.5</Path>
+            <Path fileType="man">/usr/share/man/man5/containers-storage.conf.5</Path>
+            <Path fileType="data">/var/lib/atomic/sigstore</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2019-08-20</Date>
+            <Version>0.1.39</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Mislav Čakarić</Name>
+            <Email>mcakaric@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file