diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+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: gc1000ll@gmail.com
diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/files/fop.conf b/files/fop.conf
new file mode 100644
--- /dev/null
+++ b/files/fop.conf
@@ -0,0 +1,7 @@
+FOP_HOME="/usr/share/java/fop"
+CLASSPATH="$FOP_HOME/fop.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/xmlgraphics-commons.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/commons-io.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/commons-logging.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/batik-all.jar"
+CLASSPATH="$CLASSPATH:/usr/share/java/xml-apis-ext.jar"
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,31 @@
+name       : fop
+version    : 2.4
+release    : 1
+source     :
+    - http://apache.dattatec.com/xmlgraphics/fop/source/fop-2.4-src.tar.gz : 1d6b323b1c4968a492a234ba1b726e78c96b91cfd871f77cb579d68729443086
+license    : Apache-2.0
+homepage   : https://xmlgraphics.apache.org/fop/
+component  : programming.java
+summary    : XSL-FO implementation in Java
+description: |
+    FOP (Formatting Objects Processor) is a print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter.
+
+    Output formats currently supported include PDF, PS and PNG.
+networking : yes
+builddeps  :
+    - apache-maven
+rundeps    :
+    - openjdk-8
+build      : |
+    export JAVA_HOME=/usr/lib64/openjdk-8
+    mkdir -p fop-events/target/test-classes
+    mvn -DdistributionTargetDir=$installdir/usr/share/java -Dmaven.repo.local=../local-repo -DskipTests clean install -T%YJOBS%
+install    : |
+    install -Dm00644 fop/lib/xmlgraphics-commons*.jar $installdir/usr/share/java/xmlgraphics-commons.jar
+    install -Dm00644 fop/lib/commons-io*.jar $installdir/usr/share/java/commons-io.jar
+    install -Dm00644 fop/lib/commons-logging*.jar $installdir/usr/share/java/commons-logging.jar
+    install -Dm00644 fop/lib/batik-all*.jar $installdir/usr/share/java/batik-all.jar
+    install -Dm00644 fop/lib/xml-apis-ext*.jar $installdir/usr/share/java/xml-apis-ext.jar
+    install -Dm00644 fop/target/fop-2.4.jar $installdir/usr/share/java/fop/fop.jar
+    install -Dm00644 $pkgfiles/fop.conf $installdir/etc/fop.conf
+    install -Dm00755 fop/fop $installdir/usr/bin/fop
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,46 @@
+<PISI>
+    <Source>
+        <Name>fop</Name>
+        <Homepage>https://xmlgraphics.apache.org/fop/</Homepage>
+        <Packager>
+            <Name>Martin Reboredo</Name>
+            <Email>gc1000ll@gmail.com</Email>
+        </Packager>
+        <License>Apache-2.0</License>
+        <PartOf>programming.java</PartOf>
+        <Summary xml:lang="en">XSL-FO implementation in Java</Summary>
+        <Description xml:lang="en">FOP (Formatting Objects Processor) is a print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter.
+
+Output formats currently supported include PDF, PS and PNG.
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>fop</Name>
+        <Summary xml:lang="en">XSL-FO implementation in Java</Summary>
+        <Description xml:lang="en">FOP (Formatting Objects Processor) is a print formatter driven by XSL formatting objects (XSL-FO) and an output independent formatter.
+
+Output formats currently supported include PDF, PS and PNG.
+</Description>
+        <PartOf>programming.java</PartOf>
+        <Files>
+            <Path fileType="config">/etc/fop.conf</Path>
+            <Path fileType="executable">/usr/bin/fop</Path>
+            <Path fileType="data">/usr/share/java/batik-all.jar</Path>
+            <Path fileType="data">/usr/share/java/commons-io.jar</Path>
+            <Path fileType="data">/usr/share/java/commons-logging.jar</Path>
+            <Path fileType="data">/usr/share/java/fop/fop.jar</Path>
+            <Path fileType="data">/usr/share/java/xml-apis-ext.jar</Path>
+            <Path fileType="data">/usr/share/java/xmlgraphics-commons.jar</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2020-01-05</Date>
+            <Version>2.4</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Martin Reboredo</Name>
+            <Email>gc1000ll@gmail.com</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file