diff --git a/ChangeLog b/ChangeLog
index eedcc2b834..73b5d46c0a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Wed Jan 17 11:04:58 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+	* sysdeps/unix/sysv/time.S: Moved from sysv4.
+	* sysdeps/unix/sysv/irix4/time.S: File removed.
+
+	* sysdeps/unix/sysv/linux/signum.h: Moved from
+	sysdeps/unix/sysv/linux/i386.
+	(_NSIG): Move inside #ifdef _SIGNAL_H.
+
 Tue Jan 16 17:37:39 1996  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
 	* sysdeps/unix/seekdir.c: Don't modify POS before seeking.
diff --git a/sysdeps/unix/sysv/irix4/time.S b/sysdeps/unix/sysv/irix4/time.S
deleted file mode 100644
index 23bfe5deac..0000000000
--- a/sysdeps/unix/sysv/irix4/time.S
+++ /dev/null
@@ -1 +0,0 @@
-#include <sysdeps/unix/sysv/sysv4/time.S>
diff --git a/sysdeps/unix/sysv/linux/i386/signum.h b/sysdeps/unix/sysv/linux/signum.h
similarity index 90%
rename from sysdeps/unix/sysv/linux/i386/signum.h
rename to sysdeps/unix/sysv/linux/signum.h
index 8e4f270204..021813bd70 100644
--- a/sysdeps/unix/sysv/linux/i386/signum.h
+++ b/sysdeps/unix/sysv/linux/signum.h
@@ -1,5 +1,5 @@
 /* Signal number definitions.  Linux version.
-Copyright (C) 1995 Free Software Foundation, Inc.
+Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 This file is part of the GNU C Library.
 
 The GNU C Library is free software; you can redistribute it and/or
@@ -20,9 +20,9 @@ Cambridge, MA 02139, USA.  */
 #ifdef	_SIGNAL_H
 
 /* Fake signal functions.  */
-#define	SIG_ERR	((__sighandler_t) -1) /* Error return.  */
-#define	SIG_DFL	((__sighandler_t) 0) /* Default action.  */
-#define	SIG_IGN	((__sighandler_t) 1) /* Ignore signal.  */
+#define SIG_ERR ((__sighandler_t) -1) /* Error return.  */
+#define SIG_DFL ((__sighandler_t) 0) /* Default action.  */
+#define SIG_IGN ((__sighandler_t) 1) /* Ignore signal.  */
 
 
 /* Signals.  */
@@ -31,7 +31,7 @@ Cambridge, MA 02139, USA.  */
 #define	SIGQUIT		3	/* Quit (POSIX).  */
 #define	SIGILL		4	/* Illegal instruction (ANSI).  */
 #define	SIGTRAP		5	/* Trace trap (POSIX).  */
-#define	SIGABRT		SIGIOT	/* Abort (ANSI).  */
+#define	SIGABRT		6	/* Abort (ANSI).  */
 #define	SIGIOT		6	/* IOT trap (4.2 BSD).  */
 #define	SIGBUS		7	/* BUS error (4.2 BSD).  */
 #define	SIGFPE		8	/* Floating-point exception (ANSI).  */
@@ -61,6 +61,6 @@ Cambridge, MA 02139, USA.  */
 #define	SIGPWR		30	/* Power failure restart (System V).  */
 #define SIGUNUSED	31
 
-#endif	/* <signal.h> included.  */
-
 #define	_NSIG		32	/* Biggest signal number + 1.  */
+
+#endif	/* <signal.h> included.  */
diff --git a/sysdeps/unix/sysv/sysv4/time.S b/sysdeps/unix/sysv/time.S
similarity index 100%
rename from sysdeps/unix/sysv/sysv4/time.S
rename to sysdeps/unix/sysv/time.S