diff --git a/makepatch.class b/makepatch.class
index ca788c0..8bbd523 100644
Binary files a/makepatch.class and b/makepatch.class differ
diff --git a/makepatch.java b/makepatch.java
index 201da0d..14e1186 100644
--- a/makepatch.java
+++ b/makepatch.java
@@ -54,6 +54,10 @@ if(args[0].equalsIgnoreCase("chop"))
 System.out.println(args[1].replace("eclipse/cauldron/src/main/java/",""));
 return;
 }
+else if(args[0].equalsIgnoreCase("dir"))
+{
+System.out.println(args[1].substring(0,args[1].lastIndexOf("/")));
+}
 }
 else
 System.out.println("You gave : " + args.length+" args. Usage: java makepatch FILENAME / chop ECLIPSE_CAULDRON_NAME");
diff --git a/makepatch.sh b/makepatch.sh
index 9c42f5e..5028319 100755
--- a/makepatch.sh
+++ b/makepatch.sh
@@ -17,8 +17,8 @@ then
 	PATCH=`find patches/ | grep -i $FILE`
 	if [[ -z "$PATCH" ]]
 	then
-		PATCH = "patches/$FILE"
-		mkdir -p $PATCH
+		PATCH="patches/$FILE.patch"
+		mkdir -p `java makepatch dir $FILE`
 		touch $PATCH
 	fi
 	echo "Diff patch of ${redf}$CLEAN${reset} and ${gref}$CAULD${reset} below."
@@ -32,8 +32,8 @@ then
 	PATCH=`find patches/ | grep -i $FILE`
 	if [[ -z "$PATCH" ]]
 	then
-		PATCH = "patches/$FILE"
-		mkdir -p $PATCH
+		PATCH="patches/$FILE.patch"
+		mkdir -p `java makepatch dir $FILE`
 		touch $PATCH
 	fi
 	git diff --no-prefix --no-index --text $CLEAN $CAULD > $PATCH
@@ -47,8 +47,8 @@ else
 	PATCH=`find patches/ | grep -i $FILE`
 	if [[ -z "$PATCH" ]]
 	then
-		PATCH = "patches/$FILE"
-		mkdir -p $PATCH
+		PATCH="patches/$FILE.patch"
+		mkdir -p `java makepatch dir $FILE`
 		touch $PATCH
 	fi
 	git diff --no-prefix --text --no-index $CLEAN $CAULD > $PATCH