diff --git a/client.c b/client.c
index 8708be99..aeb1d234 100644
--- a/client.c
+++ b/client.c
@@ -1,4 +1,4 @@
-/* $Id: client.c,v 1.50 2009-06-25 16:21:32 nicm Exp $ */
+/* $OpenBSD: client.c,v 1.3 2009/06/25 22:09:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -146,7 +146,6 @@ client_main(struct client_ctx *cctx)
 	logfile("client");
 
 	error = NULL;
-	xtimeout = INFTIM;
 	while (!sigterm) {
 		if (sigchld) {
 			waitpid(WAIT_ANY, NULL, WNOHANG);
diff --git a/server.c b/server.c
index a2d00a97..abeff52b 100644
--- a/server.c
+++ b/server.c
@@ -1,4 +1,4 @@
-/* $Id: server.c,v 1.149 2009-06-25 16:34:50 nicm Exp $ */
+/* $OpenBSD: server.c,v 1.4 2009/06/25 22:09:20 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -292,7 +292,7 @@ server_main(int srv_fd)
 			xtimeout = POLL_TIMEOUT;
 
 		/* Do the poll. */
-		if ((nfds = poll(pfds, nfds, xtimeout)) == -1) {
+		if (poll(pfds, nfds, xtimeout) == -1) {
 			if (errno == EAGAIN || errno == EINTR)
 				continue;
 			fatal("poll failed");