diff --git a/CHANGES b/CHANGES
index b26c1d25..870671e5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,11 @@
+27 November 2008
+
+* Tweaks to support Dragonfly.
+
+17 November 2008
+
+* tmux 0.5 released.
+
 16 November 2008
 
 * New window option: "utf8"; this must be on (it is off by default) for UTF-8
@@ -707,4 +715,4 @@
   (including mutt, emacs). No status bar yet and no key remapping or other
   customisation.
 
-$Id: CHANGES,v 1.167 2008-11-16 13:28:59 nicm Exp $
+$Id: CHANGES,v 1.168 2008-11-27 18:55:47 nicm Exp $
diff --git a/Makefile b/Makefile
index 3e861fab..1787b919 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.76 2008-11-23 19:38:12 nicm Exp $
+# $Id: Makefile,v 1.77 2008-11-27 18:55:47 nicm Exp $
 
 .SUFFIXES: .c .o .y .h
 .PHONY: clean update-index.html upload-index.html
@@ -71,8 +71,8 @@ LDFLAGS+= -pg
 .endif
 LIBS+= -lutil -lncurses
 
-# FreeBSD
-.if ${OS} == "FreeBSD"
+# FreeBSD and DragonFly
+.if ${OS} == "FreeBSD" || ${OS} == "DragonFly"
 CFLAGS+= -DUSE_LIBUTIL_H
 .endif
 
diff --git a/tmux.c b/tmux.c
index a481826d..e18ade15 100644
--- a/tmux.c
+++ b/tmux.c
@@ -1,4 +1,4 @@
-/* $Id: tmux.c,v 1.80 2008-11-16 13:28:59 nicm Exp $ */
+/* $Id: tmux.c,v 1.81 2008-11-27 18:55:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -34,7 +34,8 @@
 #include "tmux.h"
 
 #ifdef DEBUG
-#ifdef __OpenBSD__
+/* DragonFly uses an OpenBSD-like malloc() since 1.6 */
+#if defined(__OpenBSD__) || defined(__DragonFly__)
 const char	*malloc_options = "AFGJPX";
 #endif
 #ifdef __FreeBSD__
diff --git a/tty.c b/tty.c
index 22f0daf7..7dc7f441 100644
--- a/tty.c
+++ b/tty.c
@@ -1,4 +1,4 @@
-/* $Id: tty.c,v 1.51 2008-11-16 13:28:59 nicm Exp $ */
+/* $Id: tty.c,v 1.52 2008-11-27 18:55:47 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -301,10 +301,6 @@ tty_find_term(char *name, int fd, char **cause)
 		xasprintf(cause, "carriage_return missing");
 		goto error;
 	}
-	if (cursor_left == NULL) {
-		xasprintf(cause, "cursor_left missing");
-		goto error;
-	}
 	if (parm_up_cursor == NULL && cursor_up == NULL) {
 		xasprintf(cause, "parm_up_cursor missing");
 		goto error;