diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c
index 3525455c8ebf..6cea9bea1cfb 100644
--- a/sys/amd64/amd64/genassym.c
+++ b/sys/amd64/amd64/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.65 1999/04/02 17:59:37 alc Exp $
+ *	$Id: genassym.c,v 1.66 1999/04/28 01:03:18 luoqi Exp $
  */
 
 #include "opt_vm86.h"
@@ -68,6 +68,9 @@
 #endif
 #include <machine/segments.h>
 #include <machine/globaldata.h>
+#ifdef VM86
+#include <machine/vm86.h>
+#endif
 
 #define	OS(s, m)	((u_int)offsetof(struct s, m))
 
@@ -229,6 +232,9 @@ main()
 	printf("#define\tKPSEL %#x\n", GSEL(GPRIV_SEL, SEL_KPL));
 #endif
 	printf("#define\tGPROC0_SEL %#x\n", GPROC0_SEL);
+#ifdef VM86
+	printf("#define\tVM86_FRAMESIZE %#x\n", sizeof(struct vm86frame) / 4);
+#endif
 
 	return (0);
 }
diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 3525455c8ebf..6cea9bea1cfb 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- *	$Id: genassym.c,v 1.65 1999/04/02 17:59:37 alc Exp $
+ *	$Id: genassym.c,v 1.66 1999/04/28 01:03:18 luoqi Exp $
  */
 
 #include "opt_vm86.h"
@@ -68,6 +68,9 @@
 #endif
 #include <machine/segments.h>
 #include <machine/globaldata.h>
+#ifdef VM86
+#include <machine/vm86.h>
+#endif
 
 #define	OS(s, m)	((u_int)offsetof(struct s, m))
 
@@ -229,6 +232,9 @@ main()
 	printf("#define\tKPSEL %#x\n", GSEL(GPRIV_SEL, SEL_KPL));
 #endif
 	printf("#define\tGPROC0_SEL %#x\n", GPROC0_SEL);
+#ifdef VM86
+	printf("#define\tVM86_FRAMESIZE %#x\n", sizeof(struct vm86frame) / 4);
+#endif
 
 	return (0);
 }
diff --git a/sys/i386/i386/vm86bios.s b/sys/i386/i386/vm86bios.s
index 818e7d336646..4f9284ddea9b 100644
--- a/sys/i386/i386/vm86bios.s
+++ b/sys/i386/i386/vm86bios.s
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vm86bios.s,v 1.9 1999/04/28 01:03:28 luoqi Exp $
+ *	$Id: vm86bios.s,v 1.10 1999/05/11 15:57:42 luoqi Exp $
  */
 
 #include "opt_vm86.h"
@@ -89,7 +89,7 @@ ENTRY(vm86_bioscall)
 	movl	SCR_VMFRAME(%edx),%ebx	/* target frame location */
 	movl	%ebx,%edi		/* destination */
 	movl    SCR_ARGFRAME(%edx),%esi	/* source (set on entry) */
-	movl	$22,%ecx		/* sizeof(struct vm86frame)/4 */
+	movl	$VM86_FRAMESIZE,%ecx	/* sizeof(struct vm86frame)/4 */
 	cld
 	rep
 	movsl				/* copy frame to new stack */
@@ -162,7 +162,7 @@ ENTRY(vm86_biosret)
 
 	movl	4(%esp),%esi		/* source */
 	movl	SCR_ARGFRAME(%edx),%edi	/* destination */
-	movl	$22,%ecx		/* size */
+	movl	$VM86_FRAMESIZE,%ecx	/* size */
 	cld
 	rep
 	movsl				/* copy frame to original frame */