diff --git a/GNUmakefile b/GNUmakefile
index 6e2773ab..a5bc8a65 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,4 +1,4 @@
-# $Id: GNUmakefile,v 1.112 2009-07-31 10:45:22 nicm Exp $
+# $Id: GNUmakefile,v 1.113 2009-08-26 08:58:39 nicm Exp $
 
 .PHONY: clean
 
@@ -21,7 +21,7 @@ endif
 
 # This sort of sucks but gets rid of the stupid warning and should work on
 # most platforms...
-ifeq ($(shell (LC_ALL=C $(CC) -v 2>&1|awk '/gcc version 4/') || true), )
+ifeq ($(shell (LC_ALL=C $(CC) -v 2>&1|awk '/gcc version 4|clang/') || true), )
 CPPFLAGS:= -I. -I- $(CPPFLAGS)
 else
 CPPFLAGS:= -iquote. $(CPPFLAGS)
diff --git a/Makefile b/Makefile
index 47dc3b8a..568a82f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.147 2009-07-31 10:45:22 nicm Exp $
+# $Id: Makefile,v 1.148 2009-08-26 08:58:39 nicm Exp $
 
 .SUFFIXES: .c .o
 .PHONY: clean
@@ -22,7 +22,7 @@ CFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
 
 # This sort of sucks but gets rid of the stupid warning and should work on
 # most platforms...
-CCV!= (LC_ALL=C ${CC} -v 2>&1|awk '/gcc version 4/') || true
+CCV!= (LC_ALL=C ${CC} -v 2>&1|awk '/gcc version 4|clang/') || true
 .if empty(CCV)
 CPPFLAGS:= -I. -I- -I/usr/local/include ${CPPFLAGS}
 .else
diff --git a/TODO b/TODO
index 3ba1d46c..92dd8250 100644
--- a/TODO
+++ b/TODO
@@ -46,7 +46,6 @@
   errors better
 - key to switch to copy mode from scroll mode
 - attach should have a flag to create session if it doesn't exist
-- a way to address panes by name ("top-left") and position ("0,0")
 - rename split-window -> split-pane??
 - fix UTF-8 guesswork on sparc64, improve tty checks
 - choice and more mode would be better per client than per window?
@@ -101,3 +100,7 @@
 - handle resize better in copy mode
 - way to copy stuff that is off screen due to resize
 - fix line wrapping c&p problems in xterm etc
+- a way to address panes by name ("top-left") and position ("0,0")
+- a mode to identify panes
+- show pane number somewhere (separator lines?)
+
diff --git a/configure b/configure
index 8e6eacd5..d352d828 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: configure,v 1.32 2009-08-20 13:35:59 nicm Exp $
+# $Id: configure,v 1.33 2009-08-26 08:58:39 nicm Exp $
 
 TMUX_PLATFORM=${TMUX_PLATFORM:-`uname -s`}
 
@@ -214,6 +214,7 @@ EOF
 #define HAVE_STRLCPY
 #define HAVE_STRTONUM
 #define HAVE_STRSEP
+#define HAVE_TTYDEFAULTS_H
 #define HAVE_TTYDEFCHARS
 #define HAVE_U_INT
 EOF
@@ -243,6 +244,7 @@ EOF
 #define HAVE_STRLCAT
 #define HAVE_STRLCPY
 #define HAVE_STRSEP
+#define HAVE_TTYDEFAULTS_H
 #define HAVE_TTYDEFCHARS
 #define HAVE_UTIL_H
 #define HAVE_U_INT