diff --git a/ChangeLog b/ChangeLog
index 08a593272..adb2ebcb8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
    self: make changes to Makefile.in next time, not the generated Makefile).
  - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
    puttygen(1) by $PATH
+ - (tim) [scp.c] Use poll.h if available, fall back to sys/poll.h if not. Patch
+   by vinschen at redhat.com.
 
 20080312
  - (djm) OpenBSD CVS Sync
@@ -3746,4 +3748,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4872 2008/03/13 01:41:31 djm Exp $
+$Id: ChangeLog,v 1.4873 2008/03/14 00:59:50 tim Exp $
diff --git a/scp.c b/scp.c
index 1734da8f4..c047864aa 100644
--- a/scp.c
+++ b/scp.c
@@ -78,8 +78,12 @@
 #ifdef HAVE_SYS_STAT_H
 # include <sys/stat.h>
 #endif
-#ifdef HAVE_SYS_POLL_H
-# include <sys/poll.h>
+#ifdef HAVE_POLL_H
+#include <poll.h>
+#else
+# ifdef HAVE_SYS_POLL_H
+#  include <sys/poll.h>
+# endif
 #endif
 #ifdef HAVE_SYS_TIME_H
 # include <sys/time.h>