diff --git a/library/GNUmakefile.os4 b/library/GNUmakefile.os4
index 4c3d9a8..967f7d1 100644
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.97 2006-05-04 08:01:46 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.98 2006-06-22 09:02:44 obarthel Exp $
 #
 # :ts=8
 #
@@ -160,7 +160,6 @@ CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)
 C_LIB = \
 	c.lib_rev.o \
 	crtbegin.o \
-	crtend.o \
 	ctype_isalnum.o \
 	ctype_isalpha.o \
 	ctype_isascii.o \
@@ -496,7 +495,8 @@ C_LIB = \
 	unistd_unlink.o \
 	unistd_usleep.o \
 	utime_utime.o \
-	utsname_uname.o
+	utsname_uname.o \
+	crtend.o
 
 # All objects files which make up libunix.a
 UNIX_LIB = \
diff --git a/library/changes b/library/changes
index b8d0d78..8ea4fe9 100644
--- a/library/changes
+++ b/library/changes
@@ -1,3 +1,7 @@
+- select() and waitselect() can now be called without any file descriptor
+  sets to work with, as some software does which uses select() in place
+  of sleep().
+
 - The <sys/ioctl.h> header file now includes both <sys/select.h> and
   <sys/filio.h> for better compatibility with the TCP/IP stack header
   files.
diff --git a/library/socket_select_signal.c b/library/socket_select_signal.c
index 5177c7b..098e2b7 100644
--- a/library/socket_select_signal.c
+++ b/library/socket_select_signal.c
@@ -1,5 +1,5 @@
 /*
- * $Id: socket_select_signal.c,v 1.2 2006-04-05 08:39:45 obarthel Exp $
+ * $Id: socket_select_signal.c,v 1.3 2006-06-22 09:02:44 obarthel Exp $
  *
  * :ts=4
  *
@@ -938,7 +938,7 @@ __select(int num_fds,fd_set *read_fds,fd_set *write_fds,fd_set *except_fds,struc
 	else
 	{
 		/* Wait for file input? */
-		if((total_file_fd > 0) && (timeout == NULL || timeout->tv_secs > 0 || timeout->tv_micro > 0))
+		if(timeout == NULL || timeout->tv_secs > 0 || timeout->tv_micro > 0)
 		{
 			struct DateStamp stop_when;
 			BOOL got_input;
@@ -1090,7 +1090,7 @@ __select(int num_fds,fd_set *read_fds,fd_set *write_fds,fd_set *except_fds,struc
 		}
 		else
 		{
-			SHOWMSG("no files to worry about");
+			SHOWMSG("no files and no timeout to worry about");
 
 			if(signal_mask != 0)
 				(*signal_mask_ptr) = signal_mask & SetSignal(0,signal_mask & ~__break_signal_mask);