diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 60858cd30..4058117c7 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-20  David Shaw  <dshaw@jabberwocky.com>
+
+	* longlong.h: Typo.
+
+	* mpi-pow.c (mpi_powm): s/exp/exponent/ to shutup a compiler
+	warning.  From Werner on stable branch.
+
 2004-01-20  David Shaw  <dshaw@jabberwocky.com>
 
 	* hppa1.1/udiv-qrnnd.S: Alignment fix from Lamont Jones for
diff --git a/mpi/longlong.h b/mpi/longlong.h
index ba0642cf2..f2c806beb 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -924,7 +924,7 @@ extern USItype __udiv_qrnnd ();
 /* Powerpc 64 bit support taken from gmp-4.1.2. */
 /* We should test _IBMR2 here when we add assembly support for the system
    vendor compilers.  */
-#if 0 /* Not yet enabled becuase we don't have hardware for a test. */
+#if 0 /* Not yet enabled because we don't have hardware for a test. */
 #if (defined (_ARCH_PPC) || defined (__powerpc__)) && W_TYPE_SIZE == 64
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
   do {									\
diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c
index d65258b0f..73d28970c 100644
--- a/mpi/mpi-pow.c
+++ b/mpi/mpi-pow.c
@@ -39,7 +39,7 @@
  * RES = BASE ^ EXP mod MOD
  */
 void
-mpi_powm( MPI res, MPI base, MPI exp, MPI mod)
+mpi_powm( MPI res, MPI base, MPI exponent, MPI mod)
 {
     mpi_ptr_t  rp, ep, mp, bp;
     mpi_size_t esize, msize, bsize, rsize;
@@ -55,19 +55,19 @@ mpi_powm( MPI res, MPI base, MPI exp, MPI mod)
     mpi_size_t tsize=0;   /* to avoid compiler warning */
 			  /* fixme: we should check that the warning is void*/
 
-    esize = exp->nlimbs;
+    esize = exponent->nlimbs;
     msize = mod->nlimbs;
     size = 2 * msize;
-    esign = exp->sign;
+    esign = exponent->sign;
     msign = mod->sign;
 
-    esec = mpi_is_secure(exp);
+    esec = mpi_is_secure(exponent);
     msec = mpi_is_secure(mod);
     bsec = mpi_is_secure(base);
     rsec = mpi_is_secure(res);
 
     rp = res->d;
-    ep = exp->d;
+    ep = exponent->d;
 
     if( !msize )
 	msize = 1 / msize;	    /* provoke a signal */
@@ -129,7 +129,7 @@ mpi_powm( MPI res, MPI base, MPI exp, MPI mod)
 	    rp = res->d;
 	}
     }
-    else { /* Make BASE, EXP and MOD not overlap with RES.  */
+    else { /* Make BASE, EXPONENT and MOD not overlap with RES.  */
 	if( rp == bp ) {
 	    /* RES and BASE are identical.  Allocate temp. space for BASE.  */
 	    assert( !bp_marker );
@@ -137,7 +137,8 @@ mpi_powm( MPI res, MPI base, MPI exp, MPI mod)
 	    MPN_COPY(bp, rp, bsize);
 	}
 	if( rp == ep ) {
-	    /* RES and EXP are identical.  Allocate temp. space for EXP.  */
+	    /* RES and EXPONENT are identical.  
+               Allocate temp. space for EXPONENT.  */
 	    ep = ep_marker = mpi_alloc_limb_space( esize, esec );
 	    MPN_COPY(ep, rp, esize);
 	}