diff --git a/installer/bash/filebot_completion b/installer/bash/filebot_completion
index 0fbfc7d1..17c765b8 100644
--- a/installer/bash/filebot_completion
+++ b/installer/bash/filebot_completion
@@ -95,6 +95,7 @@ function _picocli_filebot() {
   conflict_OPTION_ARGS="skip override fail auto index" # --conflict values
   lang_OPTION_ARGS="Albanian Arabic Armenian Bulgarian Catalan Croatian Czech Danish Dutch English Finnish French Canadian French German Greek Hebrew Hindi Hungarian Icelandic Indonesian Italian Japanese Romanized Japanese Korean Latvian Lithuanian Macedonian Malay Chinese Taiwanese Chinese Cantonese Norwegian Persian Polish Portuguese Brazilian Portuguese Romanian Russian Serbian Slovak Slovenian Spanish Mexican Spanish Swedish Thai Turkish Ukrainian Vietnamese" # --lang values
   encoding_OPTION_ARGS="UTF-8 Windows-1252 ISO-8859-1" # --encoding values
+  StringString_OPTION_ARGS="name=value" # --def values
   log_OPTION_ARGS="OFF SEVERE WARNING INFO CONFIG FINE FINER FINEST ALL" # --log values
 
   compopt +o default
@@ -157,7 +158,8 @@ function _picocli_filebot() {
       return $?
       ;;
     --def)
-      return
+      COMPREPLY=( $( compgen -W "${StringString_OPTION_ARGS}" -- ${CURR_WORD} ) )
+      return $?
       ;;
     --file-filter)
       compopt -o filenames
diff --git a/source/net/filebot/platform/bash/BashCompletionBuilder.java b/source/net/filebot/platform/bash/BashCompletionBuilder.java
index bac9449f..a58e7523 100644
--- a/source/net/filebot/platform/bash/BashCompletionBuilder.java
+++ b/source/net/filebot/platform/bash/BashCompletionBuilder.java
@@ -85,7 +85,7 @@ class BashCompletionBuilder {
 	@Option(names = "-script", description = "Run Groovy script")
 	public File script;
 
-	@Option(names = "--def", description = "Define script variables")
+	@Option(names = "--def", description = "Define script variables", completionCandidates = DefineCompletionCandidates.class)
 	public Map<String, String> defines;
 
 	@Option(names = "-r", description = "Recursively process folders")
@@ -194,8 +194,16 @@ class BashCompletionBuilder {
 		}
 	}
 
+	private static class DefineCompletionCandidates implements Iterable<String> {
+
+		@Override
+		public Iterator<String> iterator() {
+			return Stream.of("name=value").iterator();
+		}
+	}
+
 	public static void main(String[] args) {
-		AutoComplete.main("-n", "filebot", BashCompletionBuilder.class.getName());
+		AutoComplete.main("--name", "filebot", BashCompletionBuilder.class.getName(), "--force");
 	}
 
 }