diff --git a/.gitignore b/.gitignore
index 9e527006..206be734 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@
 /.project
 /.gradle
 *.jar
-*.tiny
\ No newline at end of file
+*.tiny
+.idea/
diff --git a/src/main/java/net/fabricmc/tinyremapper/Main.java b/src/main/java/net/fabricmc/tinyremapper/Main.java
index f6bd843f..90f4ed47 100644
--- a/src/main/java/net/fabricmc/tinyremapper/Main.java
+++ b/src/main/java/net/fabricmc/tinyremapper/Main.java
@@ -48,6 +48,7 @@ public static void main(String[] rawArgs) {
 		boolean skipLocalVariableMapping = false;
 		boolean renameInvalidLocals = false;
 		NonClassCopyMode ncCopyMode = NonClassCopyMode.FIX_META_INF;
+		int threads = -1;
 
 		for (String arg : rawArgs) {
 			if (arg.startsWith("--")) {
@@ -104,6 +105,13 @@ public static void main(String[] rawArgs) {
 						System.exit(1);
 					}
 
+					break;
+				case "threads":
+					threads = Integer.parseInt(arg.substring(valueSepPos + 1));
+					if (threads <= 0) {
+						System.out.println("Thread count must be > 0");
+						System.exit(1);
+					}
 					break;
 				default:
 					System.out.println("invalid argument: "+arg+".");
@@ -185,6 +193,7 @@ public static void main(String[] rawArgs) {
 				.rebuildSourceFilenames(rebuildSourceFilenames)
 				.skipLocalVariableMapping(skipLocalVariableMapping)
 				.renameInvalidLocals(renameInvalidLocals)
+				.threads(threads)
 				.build();
 
 		try (OutputConsumerPath outputConsumer = new OutputConsumerPath.Builder(output).build()) {