diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 0a2d05b64..679238597 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-02  David Shaw  <dshaw@jabberwocky.com>
+
+	* longlong.h: Some whitespace changes in HPPA to fix assembler
+	problems on HP-UX.  From David Ellement.
+
 2002-09-20  Werner Koch  <wk@gnupg.org>
 
 	* mpicoder.c (do_get_buffer): Avoid zero length allocation.
diff --git a/mpi/longlong.h b/mpi/longlong.h
index 4102c05e3..2976a0e22 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -314,8 +314,8 @@ extern UDItype __udiv_qrnnd ();
  ***************************************/
 #if defined (__hppa) && W_TYPE_SIZE == 32
 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \
-  __asm__ ("add %4,%5,%1\n"                                             \
- 	   "addc %2,%3,%0"                                              \
+  __asm__ ("	add %4,%5,%1\n"                                             \
+ 	   "	addc %2,%3,%0"                                              \
 	   : "=r" ((USItype)(sh)),                                      \
 	     "=&r" ((USItype)(sl))                                      \
 	   : "%rM" ((USItype)(ah)),                                     \
@@ -323,8 +323,8 @@ extern UDItype __udiv_qrnnd ();
 	     "%rM" ((USItype)(al)),                                     \
 	     "rM" ((USItype)(bl)))
 #define sub_ddmmss(sh, sl, ah, al, bh, bl) \
-  __asm__ ("sub %4,%5,%1\n"                                             \
-	   "subb %2,%3,%0"                                              \
+  __asm__ ("	sub %4,%5,%1\n"                                             \
+	   "	subb %2,%3,%0"                                              \
 	   : "=r" ((USItype)(sh)),                                      \
 	     "=&r" ((USItype)(sl))                                      \
 	   : "rM" ((USItype)(ah)),                                      \
@@ -337,7 +337,7 @@ extern UDItype __udiv_qrnnd ();
     union {UDItype __ll;						\
 	   struct {USItype __h, __l;} __i;				\
 	  } __xx;							\
-    __asm__ ("xmpyu %1,%2,%0"                                           \
+    __asm__ ("	xmpyu %1,%2,%0"                                           \
 	     : "=*f" (__xx.__ll)                                        \
 	     : "*f" ((USItype)(u)),                                     \
 	       "*f" ((USItype)(v)));                                    \
@@ -362,21 +362,21 @@ extern USItype __udiv_qrnnd ();
   do {								       \
     USItype __tmp;						       \
     __asm__ (				                               \
-       "ldi             1,%0                                       \n" \
-       "extru,= 	%1,15,16,%%r0  ; Bits 31..16 zero?         \n" \
-       "extru,tr	%1,15,16,%1    ; No.  Shift down, skip add.\n" \
-       "ldo		16(%0),%0      ; Yes.	Perform add.       \n" \
-       "extru,= 	%1,23,8,%%r0   ; Bits 15..8 zero?          \n" \
-       "extru,tr	%1,23,8,%1     ; No.  Shift down, skip add.\n" \
-       "ldo		8(%0),%0       ; Yes.	Perform add.       \n" \
-       "extru,= 	%1,27,4,%%r0   ; Bits 7..4 zero?           \n" \
-       "extru,tr	%1,27,4,%1     ; No.  Shift down, skip add.\n" \
-       "ldo		4(%0),%0       ; Yes.	Perform add.       \n" \
-       "extru,= 	%1,29,2,%%r0   ; Bits 3..2 zero?           \n" \
-       "extru,tr	%1,29,2,%1     ; No.  Shift down, skip add.\n" \
-       "ldo		2(%0),%0       ; Yes.	Perform add.       \n" \
-       "extru		%1,30,1,%1     ; Extract bit 1.            \n" \
-       "sub		%0,%1,%0       ; Subtract it.              "   \
+       "	ldi             1,%0                                       \n" \
+       "	extru,= 	%1,15,16,%%r0  ; Bits 31..16 zero?         \n" \
+       "	extru,tr	%1,15,16,%1    ; No.  Shift down, skip add.\n" \
+       "	ldo		16(%0),%0      ; Yes.	Perform add.       \n" \
+       "	extru,= 	%1,23,8,%%r0   ; Bits 15..8 zero?          \n" \
+       "	extru,tr	%1,23,8,%1     ; No.  Shift down, skip add.\n" \
+       "	ldo		8(%0),%0       ; Yes.	Perform add.       \n" \
+       "	extru,= 	%1,27,4,%%r0   ; Bits 7..4 zero?           \n" \
+       "	extru,tr	%1,27,4,%1     ; No.  Shift down, skip add.\n" \
+       "	ldo		4(%0),%0       ; Yes.	Perform add.       \n" \
+       "	extru,= 	%1,29,2,%%r0   ; Bits 3..2 zero?           \n" \
+       "	extru,tr	%1,29,2,%1     ; No.  Shift down, skip add.\n" \
+       "	ldo		2(%0),%0       ; Yes.	Perform add.       \n" \
+       "	extru		%1,30,1,%1     ; Extract bit 1.            \n" \
+       "	sub		%0,%1,%0       ; Subtract it.              "   \
        : "=r" (count), "=r" (__tmp) : "1" (x));                        \
   } while (0)
 #endif /* hppa */