diff --git a/ChangeLog b/ChangeLog
index f6555915d8..b3df86a428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/hppa/brk.c: Cleanups.
+	* sysdeps/unix/sysv/linux/hppa/umount.c: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/sigaction.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/bits/signum.h: Likewise.
+	* sysdeps/unix/sysv/linux/hppa/sys/ucontext.h: Likewise.
+
 2000-10-14  Ulrich Drepper  <drepper@redhat.com>
 
 	* math/libm-test.inc (frexp_test): Add L suffix also to parameters.
@@ -97,6 +105,7 @@
 	* sysdeps/unix/sysv/linux/hppa/sysdep.c: New file.
 	* sysdeps/unix/sysv/linux/hppa/sysdep.h: New file.
 
+
 	* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h: New file.
 	* sysdeps/unix/sysv/linux/hppa/bits/ioctls.h: New file.
 	* sysdeps/unix/sysv/linux/hppa/bits/mman.h: New file.
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h b/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
index cec71b294e..bdded3d6d3 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/sigaction.h
@@ -1,4 +1,4 @@
-/* Definitions for Linux/hppa sigaction.
+/* Definitions for Linux/HPPA sigaction.
    Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/sysdeps/unix/sysv/linux/hppa/bits/signum.h b/sysdeps/unix/sysv/linux/hppa/bits/signum.h
index 45ed06ae14..a475004029 100644
--- a/sysdeps/unix/sysv/linux/hppa/bits/signum.h
+++ b/sysdeps/unix/sysv/linux/hppa/bits/signum.h
@@ -1,4 +1,4 @@
-/* Signal number definitions.  Linux version.
+/* Signal number definitions.  Linux/HPPA version.
    Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/sysdeps/unix/sysv/linux/hppa/brk.c b/sysdeps/unix/sysv/linux/hppa/brk.c
index 9ed6c4f1f7..129c2bea25 100644
--- a/sysdeps/unix/sysv/linux/hppa/brk.c
+++ b/sysdeps/unix/sysv/linux/hppa/brk.c
@@ -1,4 +1,4 @@
-/* brk system call for Linux/i386.
+/* brk system call for Linux/HPPA.
    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
diff --git a/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h b/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
index 60022f951f..c819ab1627 100644
--- a/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
+++ b/sysdeps/unix/sysv/linux/hppa/sys/ucontext.h
@@ -37,16 +37,18 @@ typedef unsigned long int greg_t;
 #define NFPREG	33
 
 /* Container for all general registers.  */
-typedef struct gregset {
-	greg_t	g_regs[32];
-	greg_t  sr_regs[5];
-	greg_t	g_pad[5];
-} gregset_t;
+typedef struct gregset
+  {
+    greg_t g_regs[32];
+    greg_t sr_regs[5];
+    greg_t g_pad[5];
+  } gregset_t;
 
 /* Container for all FPU registers.  */
-typedef struct fpregset {
-	double	fp_dregs[32];
-} fpregset_t;
+typedef struct fpregset
+  {
+    double fp_dregs[32];
+  } fpregset_t;
 
 /* Context to describe whole processor state.  */
 typedef struct
diff --git a/sysdeps/unix/sysv/linux/hppa/umount.c b/sysdeps/unix/sysv/linux/hppa/umount.c
index 39cb251030..515467b1c5 100644
--- a/sysdeps/unix/sysv/linux/hppa/umount.c
+++ b/sysdeps/unix/sysv/linux/hppa/umount.c
@@ -1,9 +1,29 @@
-/* since we don't have an oldumount system call, do what the kernel
-   does down here */
+/* Copyright (C) 2000 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+   Contributed by David Huggins-Daines <dhd@debian.org>, 2000.
 
-long __umount(char *name)
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public License as
+   published by the Free Software Foundation; either version 2 of the
+   License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with the GNU C Library; see the file COPYING.LIB.  If not,
+   write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+/* Since we don't have an oldumount system call, do what the kernel
+   does down here.  */
+
+long int
+__umount (const char *name)
 {
-	return __umount2(name, 0);
+  return __umount2 (name, 0);
 }
 
-weak_alias(__umount, umount);
+weak_alias (__umount, umount);