diff --git a/ChangeLog b/ChangeLog
index 57b27ab0a..941fd1c86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-08  OKUJI Yoshinori  <okuji@gnu.org>
+
+	From Derrik Pates <dpates@dsdk12.net>:
+	* stage2/asm.S [!STAGE1_5] (grub_halt): Set the level of APM
+	support to 1.1, before turning off the power state.
+	
 2001-08-08  OKUJI Yoshinori  <okuji@gnu.org>
 
 	* util/grub-md5-crypt.in: Prefix backquotes with backslashes in
diff --git a/THANKS b/THANKS
index 261a8d6ce..c6e1fc02d 100644
--- a/THANKS
+++ b/THANKS
@@ -21,6 +21,7 @@ Dan J. Walters <djw@cs.utexas.edu>
 Daniel Pittman <daniel@rimspace.net>
 Daniel Wagner <wagi@gmx.ch>
 Danilo Godec <danci@agenda.si>
+Derrik Pates <dpates@dsdk12.net>
 Edmund GRIMLEY EVANS <edmundo@rano.demon.co.uk>
 Edward Killips <ekillips@triton.net>
 Eric Hanchrow <erich@microsoft.com>
diff --git a/docs/grub-install.8 b/docs/grub-install.8
index 6428978f9..a5fbc8387 100644
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "July 2001" "grub-install (GNU GRUB 0.90)" FSF
+.TH GRUB-INSTALL "8" "August 2001" "grub-install (GNU GRUB 0.90)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index dddf84521..b6ee12e06 100644
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "July 2001" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "August 2001" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS
diff --git a/docs/grub.8 b/docs/grub.8
index b03f6e26c..d81f230a8 100644
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "July 2001" "grub (GNU GRUB 0.90)" FSF
+.TH GRUB "8" "August 2001" "grub (GNU GRUB 0.90)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS
diff --git a/docs/mbchk.1 b/docs/mbchk.1
index 149fc2f85..6abc19514 100644
--- a/docs/mbchk.1
+++ b/docs/mbchk.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH MBCHK "1" "July 2001" "mbchk (GNU GRUB 0.90)" FSF
+.TH MBCHK "1" "August 2001" "mbchk (GNU GRUB 0.90)" FSF
 .SH NAME
 mbchk \- check the format of a Multiboot kernel
 .SH SYNOPSIS
diff --git a/stage2/asm.S b/stage2/asm.S
index c944ce654..563f506a8 100644
--- a/stage2/asm.S
+++ b/stage2/asm.S
@@ -260,12 +260,19 @@ ENTRY(grub_halt)
 	xorw	%bx, %bx
 	int	$0x15
 
-	/* connect APM (Is this really necessary?) */
+	/* connect APM */
 	movw	$0x5301, %ax
 	xorw	%bx, %bx
 	int	$0x15
 	jc	EXT_C(hard_stop)
 
+	/* set APM protocol level - 1.1 or bust. (this covers APM 1.2 also) */
+	movw	$0x530E, %ax
+	xorw	%bx, %bx
+	movw	$0x0101, %cx
+	int	$0x15
+	jc	EXT_C(hard_stop)
+	
 	/* set the power state to off */
 	movw	$0x5307, %ax
 	movw	$1, %bx