diff --git a/Makefile b/Makefile
new file mode 100644
--- /dev/null
+++ b/Makefile
@@ -0,0 +1 @@
+include ../Makefile.common
diff --git a/create-tarball.sh b/create-tarball.sh
new file mode 100755
--- /dev/null
+++ b/create-tarball.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Check the current stable revision from https://josm.openstreetmap.de/wiki/Download
+revision=$1
+src_name=josm-$revision
+
+svn export -r $revision https://josm.openstreetmap.de/svn/trunk /tmp/$src_name
+if [ $? -eq 0 ]; then
+	tar cJf $src_name.tar.xz -C /tmp $src_name
+fi
+rm -rf /tmp/$src_name
diff --git a/files/josm b/files/josm
new file mode 100644
--- /dev/null
+++ b/files/josm
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Dsun.java2d.opengl=True -jar /usr/share/josm/josm.jar "$@"
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,23 @@
+name       : josm
+version    : 15121
+release    : 1
+source     :
+    - https://getsol.us/sources/josm-15121.tar.xz : 3006f1cf8970f39e82dda5a6d4ac46555173b4edcc378c82383951d0b7dd5c7d
+license    : GPL-2.0-or-later
+component  : office
+summary    : An extensible editor for ​OpenStreetMap
+description: |
+    JOSM is an extensible editor for ​OpenStreetMap. It supports loading GPX tracks, background imagery and OSM data from local sources as well as from online sources and allows to edit the OSM data (nodes, ways, and relations) and their metadata tags. 
+builddeps  :
+    - apache-ant
+rundeps    :
+    - openjdk-8
+setup      : |
+    to_replace='${version.entry.commit.revision}'
+    sed -e "s|$to_replace|$version|g" -i build.xml
+build      : |
+    ant dist
+install    : |
+    install -Dm00755 dist/josm-custom.jar $installdir/usr/share/josm/josm.jar
+    cp -a linux/tested/usr/share/{applications,icons,man,metainfo,pixmaps} $installdir/usr/share
+    install -Dm00755 $pkgfiles/josm -t $installdir/usr/bin
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,57 @@
+<PISI>
+    <Source>
+        <Name>josm</Name>
+        <Packager>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
+        </Packager>
+        <License>GPL-2.0-or-later</License>
+        <PartOf>office</PartOf>
+        <Summary xml:lang="en">An extensible editor for ​OpenStreetMap</Summary>
+        <Description xml:lang="en">JOSM is an extensible editor for ​OpenStreetMap. It supports loading GPX tracks, background imagery and OSM data from local sources as well as from online sources and allows to edit the OSM data (nodes, ways, and relations) and their metadata tags. 
+</Description>
+        <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
+    </Source>
+    <Package>
+        <Name>josm</Name>
+        <Summary xml:lang="en">An extensible editor for ​OpenStreetMap</Summary>
+        <Description xml:lang="en">JOSM is an extensible editor for ​OpenStreetMap. It supports loading GPX tracks, background imagery and OSM data from local sources as well as from online sources and allows to edit the OSM data (nodes, ways, and relations) and their metadata tags. 
+</Description>
+        <PartOf>office</PartOf>
+        <Files>
+            <Path fileType="executable">/usr/bin/josm</Path>
+            <Path fileType="data">/usr/share/applications/org.openstreetmap.josm.desktop</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/128x128/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/16x16/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/192x192/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/22x22/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/24x24/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/256x256/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/32x32/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/36x36/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/40x40/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/42x42/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/48x48/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/512x512/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/64x64/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/72x72/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/80x80/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/8x8/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/96x96/apps/org.openstreetmap.josm.png</Path>
+            <Path fileType="data">/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg</Path>
+            <Path fileType="data">/usr/share/josm/josm.jar</Path>
+            <Path fileType="man">/usr/share/man/man1/josm.1</Path>
+            <Path fileType="data">/usr/share/metainfo/org.openstreetmap.josm.appdata.xml</Path>
+            <Path fileType="data">/usr/share/pixmaps/org.openstreetmap.josm.png</Path>
+        </Files>
+    </Package>
+    <History>
+        <Update release="1">
+            <Date>2019-05-27</Date>
+            <Version>15121</Version>
+            <Comment>Packaging update</Comment>
+            <Name>Fabio Forni</Name>
+            <Email>livingsilver94.solus@redaril.me</Email>
+        </Update>
+    </History>
+</PISI>
\ No newline at end of file