diff --git a/ChangeLog b/ChangeLog
index 00279e2af..bb1dd26f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-05-02  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
+
+	* shared_src/asm.S (biosdisk_standard): Pop %ebp correctly, reported
+	by Pavel Roskin <pavel_roskin@geocities.com>.
+	
 1999-04-25  OKUJI Yoshinori  <okuji@kuicr.kyoto-u.ac.jp>
 
 	* docs/menu.lst: Rewritten, so that it contains up-to-date
diff --git a/shared_src/asm.S b/shared_src/asm.S
index 293ccdaaf..8b5da00f8 100644
--- a/shared_src/asm.S
+++ b/shared_src/asm.S
@@ -458,6 +458,7 @@ ENTRY(biosdisk_standard)
 	popl	%edx
 	popl	%ecx
 	popl	%ebx
+	popl	%ebp
 
 	ret