diff --git a/build.xml b/build.xml
index f44d27e5..e5faebd6 100644
--- a/build.xml
+++ b/build.xml
@@ -147,6 +147,11 @@
 				<fileset dir="${dir.installer}/workflows" />
 			</copy>
 
+			<!-- include bash completion -->
+			<copy todir="${dir.staging}/${application.name}.app/Contents/MacOS">
+				<fileset dir="${dir.installer}/bash" />
+			</copy>
+
 			<!-- fix permissions -->
 			<chmod perm="+x" verbose="yes">
 				<fileset dir="${dir.staging}/${application.name}.app">
@@ -336,6 +341,8 @@
 		<delete verbose="yes" includeEmptyDirs="yes">
 			<fileset dir="${path.app}">
 				<include name="**/Workflows/**" />
+				<include name="**/*.sh" />
+				<include name="**/*_completion" />
 				<include name="**/bin/**" />
 				<include name="**/*.lproj/**" />
 				<exclude name="**/en.lproj/**" />
@@ -355,7 +362,6 @@
 			<fileset dir="${path.app}">
 				<include name="**/jspawnhelper" />
 				<include name="**/fpcalc" />
-				<include name="**/*.sh" />
 			</fileset>
 		</chmod>
 
@@ -372,7 +378,6 @@
 				<include name="**/fpcalc" />
 				<include name="**/*.dylib" />
 				<include name="**/*.jar" />
-				<include name="**/*.sh" />
 			</fileset>
 		</apply>
 
@@ -470,6 +475,8 @@
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
+
+			<tarfileset fullpath="/etc/bash_completion.d/filebot" file="${dir.installer}/bash/filebot_completion" />
 		</jdeb>
 	</target>
 
@@ -491,6 +498,8 @@
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
+
+			<tarfileset fullpath="/etc/bash_completion.d/filebot" file="${dir.installer}/bash/filebot_completion" />
 		</jdeb>
 	</target>
 
@@ -538,6 +547,9 @@
 
 			<!-- include maintainer public key -->
 			<tarfileset dir="${dir.installer}/gpg" includes="maintainer.gpg" />
+
+			<!-- include bash completion -->
+			<tarfileset prefix="completion" dir="${dir.installer}/bash" />
 		</tar>
 	</target>
 
@@ -564,6 +576,8 @@
 
 			<tarfileset prefix="/usr/share/icons/hicolor/scalable/apps" dir="${dir.installer}/icons" includes="filebot.svg" />
 			<tarfileset prefix="/usr/share" dir="${dir.staging}/share" />
+
+			<tarfileset fullpath="/etc/bash_completion.d/filebot" file="${dir.installer}/bash/filebot_completion" />
 		</tar>
 	</target>
 
@@ -586,6 +600,9 @@
 			<fileset dir="${dir.installer}/icons" includes="filebot.svg" />
 		</copy>
 
+		<!-- include bash completion -->
+		<copy tofile="${dir.staging}/etc/bash_completion.d/filebot" file="${dir.installer}/bash/filebot_completion" />
+
 		<!-- fix execute permissions -->
 		<chmod verbose="yes" perm="+x">
 			<fileset dir="${dir.staging}" includes="**/*.sh" />
@@ -639,6 +656,10 @@
 			<package prefix="lib/i686" dir="${dir.lib}/native/linux-i686" includes="*.so" />
 			<package prefix="lib/x86_64" dir="${dir.lib}/native/linux-amd64" includes="*.so" />
 
+			<!-- include bash completion -->
+			<package prefix="completion" dir="${dir.installer}/bash" />
+
+
 			<codesign secring="${dir.installer}/gpg/syno.gpg" keyid="${gpg.key}" password="${gpg.pwd}" />
 		</spk>
 
@@ -688,6 +709,11 @@
 			</fileset>
 		</copy>
 
+		<!-- include bash completion -->
+		<copy todir="${dir.base}/completion">
+			<fileset dir="${dir.installer}/bash" />
+		</copy>
+
 		<!-- fix execute permissions -->
 		<chmod verbose="yes" perm="+x">
 			<fileset dir="${dir.base}" includes="**/*.sh" />
diff --git a/installer/rpm/filebot.spec b/installer/rpm/filebot.spec
index 6fcd2ba5..3d4ded5d 100644
--- a/installer/rpm/filebot.spec
+++ b/installer/rpm/filebot.spec
@@ -19,7 +19,7 @@ Recommends:     p7zip-plugins
 
 
 %install
-cp -rvf %{src}/usr %{buildroot}
+cp -rvf %{src}/usr %{src}/etc %{buildroot}
 
 
 %files