diff --git a/jode/bin/Makefile.am b/jode/bin/Makefile.am
index da0c744..f31e597 100644
--- a/jode/bin/Makefile.am
+++ b/jode/bin/Makefile.am
@@ -1,4 +1,5 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-bin_SCRIPTS = jode
+bin_SCRIPTS = jode 
+EXTRA_DIST = jode.bat
 
diff --git a/jode/bin/jode.bat.in b/jode/bin/jode.bat.in
new file mode 100644
index 0000000..bcdfe50
--- /dev/null
+++ b/jode/bin/jode.bat.in
@@ -0,0 +1,19 @@
+; Use this batch file to make invoking the decompiler easier.
+; Please edit this file and insert correct directories where needed.
+;
+; Usage:  jode dec [decompiler options]
+;         jode swi [swingui options]
+;         jode obf [obfuscator options]
+; Since the decompiler is the most important program you can omit `dec':
+;         jode [decompiler options]
+
+set CLASSPATH=jode-@VERSION@-1.2.jar;%CLASSPATH%
+set PROGGY=default
+
+if %1 == swi set PROGGY=swingui
+if %1 == obf set PROGGY=obfuscator
+if %1 == dec set PROGGY=decompiler
+if NOT %PROGGY% == default shift
+if %PROGGY% == default set PROGGY=decompiler
+
+java jode.%PROGGY%.Main %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/jode/bin/jode.in b/jode/bin/jode.in
index 75bad3b..1d4d31d 100644
--- a/jode/bin/jode.in
+++ b/jode/bin/jode.in
@@ -3,9 +3,9 @@ prefix=@prefix@
 
 case $1 in
   [Ss]wi*) CLAZZ=jode.swingui.Main; shift ;;
-  [Dd]ec*) CLAZZ=jode.Decompiler; shift ;;
+  [Dd]ec*) CLAZZ=jode.decompiler.Main; shift ;;
   [Oo]bf*) CLAZZ=jode.obfuscator.Main; shift ;;
-	*) CLAZZ=jode.Decompiler ;;
+	*) CLAZZ=jode.decompiler.Main ;;
 esac