diff --git a/ChangeLog b/ChangeLog
index c8f85fd8b..4ec2282de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20120223
+ - (djm) [configure.ac includes.h loginrec.c mux.c sftp.c] Prefer
+   bsd/libutil.h to libutil.h to avoid deprecation warnings on Ubuntu.
+   ok tim
+
 20120222
  - (dtucker) [Makefile.in configure.ac] bz#2072: don't link krb5 libs to
    ssh(1) since they're not needed.  Patch from Pierre Ossman, ok djm.
diff --git a/configure.ac b/configure.ac
index e526390f7..3ea3f8a35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.508 2013/02/22 00:37:00 djm Exp $
+# $Id: configure.ac,v 1.509 2013/02/22 22:12:24 djm Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +15,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 AC_INIT([OpenSSH], [Portable], [openssh-unix-dev@mindrot.org])
-AC_REVISION($Revision: 1.508 $)
+AC_REVISION($Revision: 1.509 $)
 AC_CONFIG_SRCDIR([ssh.c])
 AC_LANG([C])
 
@@ -1163,7 +1163,7 @@ AC_CHECK_FUNCS([utimes],
 )
 
 dnl    Checks for libutil functions
-AC_CHECK_HEADERS([libutil.h])
+AC_CHECK_HEADERS([bsd/libutil.h libutil.h])
 AC_SEARCH_LIBS([fmt_scaled], [util bsd])
 AC_SEARCH_LIBS([login], [util bsd])
 AC_SEARCH_LIBS([logout], [util bsd])
diff --git a/includes.h b/includes.h
index b4c53d9b4..3e206c899 100644
--- a/includes.h
+++ b/includes.h
@@ -137,8 +137,10 @@
 # include <tmpdir.h>
 #endif
 
-#ifdef HAVE_LIBUTIL_H
-# include <libutil.h> /* Openpty on FreeBSD at least */
+#if defined(HAVE_BSD_LIBUTIL_H)
+# include <bsd/libutil.h>
+#elif defined(HAVE_LIBUTIL_H)
+# include <libutil.h>
 #endif
 
 #if defined(KRB5) && defined(USE_AFS)
diff --git a/loginrec.c b/loginrec.c
index 32941c985..f9662fa5c 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -180,10 +180,6 @@
 # include <util.h>
 #endif
 
-#ifdef HAVE_LIBUTIL_H
-# include <libutil.h>
-#endif
-
 /**
  ** prototypes for helper functions in this file
  **/
diff --git a/mux.c b/mux.c
index 1b24660b2..1ae0e0915 100644
--- a/mux.c
+++ b/mux.c
@@ -63,10 +63,6 @@
 # include <util.h>
 #endif
 
-#ifdef HAVE_LIBUTIL_H
-# include <libutil.h>
-#endif
-
 #include "openbsd-compat/sys-queue.h"
 #include "xmalloc.h"
 #include "log.h"
diff --git a/sftp.c b/sftp.c
index 9a53b12b7..342ae7efc 100644
--- a/sftp.c
+++ b/sftp.c
@@ -54,10 +54,6 @@ typedef void EditLine;
 # include <util.h>
 #endif
 
-#ifdef HAVE_LIBUTIL_H
-# include <libutil.h>
-#endif
-
 #include "xmalloc.h"
 #include "log.h"
 #include "pathnames.h"