diff --git a/build.xml b/build.xml
index 3ec1c57c..b7dab288 100644
--- a/build.xml
+++ b/build.xml
@@ -553,17 +553,14 @@
 		<copy-replace todir="${dir.staging}">
 			<fileset dir="${dir.installer}/deb" />
 		</copy-replace>
-		<copy todir="${dir.staging}">
-			<fileset dir="${dir.lib}/native/linux-${arch}" />
-			<fileset file="${dir.installer}/icons/${package.name}.svg" />
-		</copy>
-		<copy file="${path.fatjar}" tofile="${dir.staging}/FileBot.jar" />
 
 		<jdeb destfile="${dir.dist}/${package.name}_${version}_${deb.arch}.deb" control="${dir.staging}/control" compression="xz" verbose="true">
-			<tarfileset prefix="/usr/share/${package.name}" dir="${dir.staging}" includes="*.sh, fpcalc" filemode="755" />
-			<tarfileset prefix="/usr/share/${package.name}" dir="${dir.staging}" includes="*.jar, *.so" />
-			<tarfileset prefix="/usr/share/applications" dir="${dir.staging}" includes="*.desktop" />
-			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.staging}" includes="*.svg" />
+			<tarfileset fullpath="/usr/share/filebot/FileBot.jar" file="${path.fatjar}" />
+			<tarfileset prefix="/usr/share/filebot" dir="${dir.lib}/native/linux-${arch}" includes="*.so" />
+			<tarfileset prefix="/usr/share/filebot" dir="${dir.lib}/native/linux-${arch}" includes="fpcalc" filemode="755" />
+			<tarfileset prefix="/usr/share/filebot" dir="${dir.staging}" includes="*.sh" filemode="755" />
+			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
+			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
 		</jdeb>
 	</target>
 
diff --git a/installer/deb/filebot.desktop b/installer/deb/share/applications/filebot.desktop
similarity index 100%
rename from installer/deb/filebot.desktop
rename to installer/deb/share/applications/filebot.desktop
diff --git a/installer/deb/share/kservices5/ServiceMenus/filebot.desktop b/installer/deb/share/kservices5/ServiceMenus/filebot.desktop
new file mode 100644
index 00000000..b2c1800a
--- /dev/null
+++ b/installer/deb/share/kservices5/ServiceMenus/filebot.desktop
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Type=Service
+Name=FileBot
+Icon=filebot
+ServiceTypes=KonqPopupMenu/Plugin
+Actions=Rename;Subtitles;Checksum;Import;
+MimeType=inode/directory;video/*;audio/*;text/*;
+X-KDE-Priority=TopLevel
+X-KDE-Submenu=FileBot
+
+[Desktop Action Rename]
+Name=Rename
+Exec=filebot --mode Rename %F
+
+[Desktop Action Subtitles]
+Name=Subtitles
+Exec=filebot --mode Subtitles %F
+
+[Desktop Action Checksum]
+Name=Checksum
+Exec=filebot --mode SFV %F
+
+[Desktop Action Import]
+Name=Import to Media Library
+Icon=utilities-terminal
+Exec=konsole -e filebot -script fn:amc --output "$HOME/Media" --action duplicate -non-strict --log-file import.log --def excludeList=.excludes unsorted=y music=y artwork=y %F