diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 624a7f175..44237208e 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,10 @@
+2002-04-18  Werner Koch  <wk@gnupg.org>
+
+	* i386/syntax.h (ALIGN): Removed parens from definition
+	* i386/mpih-add1.S, i386/mpih-sub1.S, i386/mpih-rshift.S,
+	i386/mpih-lshift.S: Minor syntax changes suggested by Mark Pettit
+	after comparing the files with those for GMP 4.
+	
 2001-11-08  Werner Koch  <wk@gnupg.org>
 
 	* config.links (mpi_sflags): Add extra rule for sparc64-sun-solaris2.
diff --git a/mpi/i386/mpih-add1.S b/mpi/i386/mpih-add1.S
index 3b3b23c8c..da7e7f8b3 100644
--- a/mpi/i386/mpih-add1.S
+++ b/mpi/i386/mpih-add1.S
@@ -2,7 +2,7 @@
  *		   sum in a third limb vector.
  *
  *      Copyright (C) 1992, 1994, 1995, 1998, 
- *                    2001 Free Software Foundation, Inc.
+ *                    2001, 2002 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -75,7 +75,7 @@ L0:	leal	(%eax,%eax,8),%eax
 	addl	$4,%esp
 #else
 /* Calculate start address in loop for non-PIC.  */
-	leal	(Loop - 3)(%eax,%eax,8),%eax
+	leal	Loop-3(%eax,%eax,8),%eax
 #endif
 	jmp	*%eax			/* jump into loop */
 	ALIGN (3)
diff --git a/mpi/i386/mpih-lshift.S b/mpi/i386/mpih-lshift.S
index 5e6387a4f..a7dad2c96 100644
--- a/mpi/i386/mpih-lshift.S
+++ b/mpi/i386/mpih-lshift.S
@@ -57,21 +57,21 @@ C_SYMBOL_NAME(mpihelp_lshift:)
 
 	movl	(%esi,%edx,4),%ebx	/* read most significant limb */
 	xorl	%eax,%eax
-	shldl	%cl,%ebx,%eax		/* compute carry limb */
+	shldl	%ebx,%eax		/* compute carry limb */
 	decl	%edx
 	jz	Lend
 	pushl	%eax			/* push carry limb onto stack */
-	testb	$1,%edx
+	testb	$1,%dl
 	jnz	L1			/* enter loop in the middle */
 	movl	%ebx,%eax
 
 	ALIGN (3)
 Loop:	movl	(%esi,%edx,4),%ebx	/* load next lower limb */
-	shldl	%cl,%ebx,%eax		/* compute result limb */
+	shldl	%ebx,%eax		/* compute result limb */
 	movl	%eax,(%edi,%edx,4)	/* store it */
 	decl	%edx
 L1:	movl	(%esi,%edx,4),%eax
-	shldl	%cl,%eax,%ebx
+	shldl	%eax,%ebx
 	movl	%ebx,(%edi,%edx,4)
 	decl	%edx
 	jnz	Loop
diff --git a/mpi/i386/mpih-rshift.S b/mpi/i386/mpih-rshift.S
index 9718204c7..4886a98ca 100644
--- a/mpi/i386/mpih-rshift.S
+++ b/mpi/i386/mpih-rshift.S
@@ -1,7 +1,7 @@
 /* i80386   rshift
  *
  *      Copyright (C) 1992, 1994, 1998, 
- *                    2001 Free Software Foundation, Inc.
+ *                    2001, 2002 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -60,21 +60,21 @@ C_SYMBOL_NAME(mpihelp_rshift:)
 
 	movl	(%esi,%edx,4),%ebx	/* read least significant limb */
 	xorl	%eax,%eax
-	shrdl	%cl,%ebx,%eax		/* compute carry limb */
+	shrdl	%ebx,%eax		/* compute carry limb */
 	incl	%edx
 	jz	Lend2
 	pushl	%eax			/* push carry limb onto stack */
-	testb	$1,%edx
+	testb	$1,%dl
 	jnz	L2			/* enter loop in the middle */
 	movl	%ebx,%eax
 
 	ALIGN (3)
-Loop2:	 movl	 (%esi,%edx,4),%ebx	 /* load next higher limb */
-	shrdl	%cl,%ebx,%eax		/* compute result limb */
+Loop2:	movl	 (%esi,%edx,4),%ebx	 /* load next higher limb */
+	shrdl	%ebx,%eax		/* compute result limb */
 	movl	%eax,(%edi,%edx,4)	/* store it */
 	incl	%edx
 L2:	movl	(%esi,%edx,4),%eax
-	shrdl	%cl,%eax,%ebx
+	shrdl	%eax,%ebx
 	movl	%ebx,(%edi,%edx,4)
 	incl	%edx
 	jnz	Loop2
diff --git a/mpi/i386/mpih-sub1.S b/mpi/i386/mpih-sub1.S
index 169c53950..2339334fe 100644
--- a/mpi/i386/mpih-sub1.S
+++ b/mpi/i386/mpih-sub1.S
@@ -2,7 +2,7 @@
  *		   sum in a third limb vector.
  *
  *      Copyright (C) 1992, 1994, 1995, 1998, 
- *                    2001 Free Software Foundation, Inc.
+ *                    2001, 2002 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -76,7 +76,7 @@ L0:	leal	(%eax,%eax,8),%eax
 	addl	$4,%esp
 #else
 /* Calculate start address in loop for non-PIC.  */
-	leal	(Loop - 3)(%eax,%eax,8),%eax
+	leal	Loop-3(%eax,%eax,8),%eax
 #endif
 	jmp	*%eax			/* jump into loop */
 	ALIGN (3)
diff --git a/mpi/i386/syntax.h b/mpi/i386/syntax.h
index 5a2c7b232..035c01960 100644
--- a/mpi/i386/syntax.h
+++ b/mpi/i386/syntax.h
@@ -45,7 +45,7 @@
 #define ALIGN(log) .align log
 #endif
 #if defined (ELF_SYNTAX)
-#define ALIGN(log) .align 1<<(log)
+#define ALIGN(log) .align 1<<log
 #endif
 #define GLOBL .globl
 #endif