diff --git a/source/net/sourceforge/filebot/Main.java b/source/net/sourceforge/filebot/Main.java
index 2022eab4..c05a7d02 100644
--- a/source/net/sourceforge/filebot/Main.java
+++ b/source/net/sourceforge/filebot/Main.java
@@ -149,6 +149,9 @@ public class Main {
 			if (args.disableAnalytics) {
 				System.setProperty("application.analytics", "false");
 			}
+			if (args.disableExtendedAttributes) {
+				System.setProperty("useExtendedFileAttributes", "false");
+			}
 			if (args.action.equalsIgnoreCase("test")) {
 				System.setProperty("useExtendedFileAttributes", "false");
 				System.setProperty("application.analytics", "false");
diff --git a/source/net/sourceforge/filebot/cli/ArgumentBean.java b/source/net/sourceforge/filebot/cli/ArgumentBean.java
index f5f30b56..da248292 100644
--- a/source/net/sourceforge/filebot/cli/ArgumentBean.java
+++ b/source/net/sourceforge/filebot/cli/ArgumentBean.java
@@ -104,6 +104,9 @@ public class ArgumentBean {
 	@Option(name = "-unixfs", usage = "Do not strip invalid characters from file paths")
 	public boolean unixfs = false;
 	
+	@Option(name = "-no-xattr", usage = "Disable extended attributes")
+	public boolean disableExtendedAttributes = false;
+	
 	@Option(name = "-no-analytics", usage = "Disable analytics")
 	public boolean disableAnalytics = false;