diff --git a/ChangeLog b/ChangeLog
index 0bfc6521c..883c5e7c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-29  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* stage2/asm.S [STAGE1_5]: Don't include setjmp.S or apm.S.
+	
 2000-10-27  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* lib/device.c (read_device_map): Don't parse a line, if it is
diff --git a/stage2/asm.S b/stage2/asm.S
index 4b2cd5066..9cf777d49 100644
--- a/stage2/asm.S
+++ b/stage2/asm.S
@@ -1323,8 +1323,10 @@ probe_values:
 
 
 /* Source files are splitted, as they have different copyrights.  */
-#include "setjmp.S"
-#include "apm.S"
+#ifndef STAGE1_5
+# include "setjmp.S"
+# include "apm.S"
+#endif /* ! STAGE1_5 */
 		
 /*
  * console_putchar(c)