diff --git a/build.xml b/build.xml
index 24dd6309..b32956ac 100644
--- a/build.xml
+++ b/build.xml
@@ -62,6 +62,7 @@
   	<antcall target="compile" />
  		<antcall target="javadoc" />
   	<antcall target="-createjars" />
+		<antcall target="debug-jars"/>
 		<antcall target="applet-release" />
   	
   	<!-- copy resources to res folder -->
@@ -94,6 +95,15 @@
 			</fileset>
 		</move>
 	</target>
+	
+	<target name="debug-jars" description="Creates the Java archives ONLY, the debug version of lwjgl jar, and places them in libs/" depends="jars">
+		<!--		<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<!--<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">-->
+		<antcall target="generate-debug"/>
+		<antcall target="compile"/>
+		<antcall target="-createjars"/>
+		<move tofile="libs/lwjgl-debug.jar" file="${lwjgl.temp}/jar/lwjgl.jar"/>
+	</target>
 
 	<!-- Packages the java files -->
 	<target name="-createjars">
@@ -132,7 +142,7 @@
 		</delete>	
 
 	    <copy file="${lwjgl.lib}/jinput.jar" todir="${lwjgl.temp}/jar"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar" failonerror="false"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="${lwjgl.temp}/jar"/>
 		<copy todir="${lwjgl.temp}/native/windows">
 			<fileset dir="${lwjgl.lib}/windows">
 				<patternset refid="lwjgl-windows.fileset" />
diff --git a/platform_build/build-applet.xml b/platform_build/build-applet.xml
index cf301cc9..94836667 100644
--- a/platform_build/build-applet.xml
+++ b/platform_build/build-applet.xml
@@ -69,7 +69,7 @@
   	</jar>
 
 	  	<copy file="${lwjgl.lib}/lwjgl.jar" todir="applet"/>
-		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet" failonerror="false"/>
+		<copy file="${lwjgl.lib}/lwjgl-debug.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util_applet.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/lwjgl_util.jar" todir="applet"/>
 		<copy file="${lwjgl.lib}/jinput.jar" todir="applet"/>
diff --git a/platform_build/build-generator.xml b/platform_build/build-generator.xml
index 4f155290..2d526f74 100644
--- a/platform_build/build-generator.xml
+++ b/platform_build/build-generator.xml
@@ -18,6 +18,8 @@
 	<!-- Proxy target to generate it all -->
 	<target name="generate-all" depends="generate-openal, generate-opengl, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
 
+	<target name="generate-debug" depends="generate-openal, generate-opengl-debug, generate-opengl-capabilities, generate-opengl-references" description="Generates java and native source"/>
+
 	<!-- Generate OpenAL -->
 	<target name="generate-openal" depends="generators" description="Generates java and native source for AL">
 		<apply executable="apt" parallel="true">
@@ -55,6 +57,25 @@
 		</apply>
 	</target>
 
+	<!-- Generate OpenGL -->
+	<target name="generate-opengl-debug" depends="generators" description="Generates java and native source for GL">
+		<apply executable="apt" parallel="true">
+			<arg value="-nocompile"/>
+			<arg value="-factory"/>
+			<arg value="org.lwjgl.util.generator.GeneratorProcessorFactory"/>
+			<arg value="-cp"/>
+			<arg path="${lwjgl.src}/java:${lwjgl.src.templates}:${lwjgl.bin}:${java.class.path}"/>
+			<arg value="-s"/>
+			<arg path="${lwjgl.src}/generated"/>
+			<arg value="-d"/>
+			<arg path="${lwjgl.src.native}/generated"/>
+			<arg value="-Ageneratechecks"/>
+			<arg value="-Acontextspecific"/>
+			<arg value="-Atypemap=org.lwjgl.util.generator.GLTypeMap"/>
+			<fileset dir="${lwjgl.src.templates}" includes="${opengl-template-pattern}"/>
+		</apply>
+	</target>
+
 	<!-- Generate context capabilities -->
 	<target name="generate-opengl-references" depends="generators" description="Generates java and native source for GL">
 		<apply executable="apt" parallel="true">