diff --git a/src/ChangeLog b/src/ChangeLog
index 929cea2832a..ddf73eaf3c5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-20  enami tsugutomo  <tsugutomo.enami@jp.sony.com>
+
+	* s/netbsd.h: If terminfo is found, use it in preference to
+	termcap.  (Bug#6190)  [Backport from trunk]
+
 2010-05-20  Kevin Ryde  <user42@zip.com.au>
 
 	* keyboard.c (Vlast_command, Vkeyboard_translate_table)
diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 17d3b33451e..132fc137e50 100644
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -45,7 +45,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define LIBS_DEBUG
 /* -lutil is not needed for NetBSD >0.9.  */
 /* #define LIBS_SYSTEM -lutil */
+#ifdef HAVE_TERM_H
+#define TERMINFO
+#define LIBS_TERMCAP -lterminfo
+#else
 #define LIBS_TERMCAP -ltermcap
+#endif
 
 #define NEED_ERRNO
 #define SYSV_SYSTEM_DIR