diff --git a/build.xml b/build.xml
index cdf8909a..af9a0ee2 100644
--- a/build.xml
+++ b/build.xml
@@ -504,6 +504,28 @@
 	</target>
 
 
+	<target name="snap" description="Build Ubuntu Linux package">
+		<!-- copy files and resolve ant variables -->
+		<copy todir="${dir.dist}/snappy" overwrite="yes" encoding="UTF-8" verbose="true">
+			<fileset dir="${dir.installer}/snappy" />
+			<filterset begintoken="@{" endtoken="}">
+				<propertyset>
+					<propertyref builtin="all" />
+				</propertyset>
+			</filterset>
+		</copy>
+
+		<copy tofile="${dir.dist}/snappy/filebot/FileBot.jar" file="${path.fatjar}" />
+		<copy todir="${dir.dist}/snappy/filebot/lib/amd64">
+			<fileset dir="${dir.lib}/native/linux-amd64" />
+		</copy>
+
+		<exec dir="${dir.dist}/snappy" executable="snapcraft" failonerror="on">
+			<arg line="snap" />
+		</exec>
+	</target>
+
+
 	<target name="deb" description="Build Debian Linux packages">
 		<taskdef name="deb" classname="com.googlecode.ant_deb_task.Deb" classpathref="jars.classpath" />
 		<antcall target="deb-arch">
@@ -746,7 +768,6 @@
 		</copy>
 
 		<!-- copy files and resolve ant variables -->
-		<echo message="Replace Ant variables" />
 		<copy todir="${dir.dist}/website" overwrite="yes" encoding="UTF-8" verbose="true">
 			<fileset dir="${dir.website}">
 				<include name="*.html" />
diff --git a/installer/snappy/filebot.sh b/installer/snappy/filebot/filebot.sh
similarity index 100%
rename from installer/snappy/filebot.sh
rename to installer/snappy/filebot/filebot.sh
diff --git a/installer/snappy/snapcraft.yaml b/installer/snappy/snapcraft.yaml
index 1051cf71..f75fae33 100644
--- a/installer/snappy/snapcraft.yaml
+++ b/installer/snappy/snapcraft.yaml
@@ -1,7 +1,7 @@
 name: filebot
-version: 4.7.2~snap1
+version: @{version}_@{revision}
 summary: The ultimate TV and Movie Renamer / Subtitle Downloader
-description: FileBot is the ultimate tool for renaming your movies, tv shows or anime and even downloading subtitles. It's smart, streamlined for simplicity and just works. Putting the super-efficient UI aside, it's also got a full-featured command-line interface and scripting engine for all sorts of automation. Anything is possible.
+description: FileBot is the ultimate tool for organizing and renaming your movies, tv shows or anime, and music well as downloading subtitles and artwork. It's smart and just works.
 
 confinement: strict
 
@@ -16,9 +16,7 @@ parts:
   filebot:
     plugin: copy
     files:
-      filebot.sh: filebot/filebot.sh
-      FileBot.jar: filebot/FileBot.jar
-      lib7-Zip-JBinding.so: filebot/lib/amd64/lib7-Zip-JBinding.so
+      filebot: filebot
   java:
     plugin: nil
     stage-packages: [openjdk-8-jre, openjfx, jayatana]