diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,6 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+
+- Martin Reboredo
+  - IRC: YakoYako
+  - Email: yakoyoku@gmail.com
+  - Matrix: @yakoyakoyokuyoku:matrix.org
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,20 @@
+name       : gocloc
+version    : 0.4.1
+release    : 1
+source     :
+    - https://github.com/hhatto/gocloc/archive/refs/tags/v0.4.1.tar.gz : 528be5009996b4177936be508aa494c289adddf58e4694b1a36067bda433f783
+homepage   : https://github.com/hhatto/gocloc
+license    : MIT
+component  : programming.tools
+summary    : Go Count Lines Of Code
+description: |
+    A little fast cloc (Count Lines Of Code), written in Go.
+networking : yes
+builddeps  :
+    - golang
+build      : |
+    %make
+install    : |
+    install -Dm00755 bin/gocloc $installdir/usr/bin/gocloc
+check      : |
+    %make test
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,35 @@
+<PISI>
+    <Source>
+        <Name>gocloc</Name>
+        <Homepage>https://github.com/hhatto/gocloc</Homepage>
+        <Packager>
+            <Name>Martin Reboredo</Name>
+            <Email>yakoyoku@gmail.com</Email>
+        </Packager>
+        <License>MIT</License>
+        <PartOf>programming.tools</PartOf>
+        <Summary xml:lang="en">Go Count Lines Of Code</Summary>
+        <Description xml:lang="en">A little fast cloc (Count Lines Of Code), written in Go.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>gocloc</Name>
+        <Summary xml:lang="en">Go Count Lines Of Code</Summary>
+        <Description xml:lang="en">A little fast cloc (Count Lines Of Code), written in Go.
+</Description>
+        <PartOf>programming.tools</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin/gocloc</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2021-08-25</Date>
+            <Version>0.4.1</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Martin Reboredo</Name>
+            <Email>yakoyoku@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file