diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 508961d90..9d62ae50f 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-06  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in (clean): Clean generated files in srcdir.
+	* tlsoffsets.h: Regenerate.
+
 2009-07-06  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* cygtls.cc (_cygtls::remove): Avoid closing a NULL handle.
diff --git a/winsup/cygwin/Makefile.in b/winsup/cygwin/Makefile.in
index b87f0fd85..bac721e69 100644
--- a/winsup/cygwin/Makefile.in
+++ b/winsup/cygwin/Makefile.in
@@ -376,7 +376,7 @@ uninstall-man:
 	done
 
 clean:
-	-rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc regexp/*.o winver_stamp *.exe *.d *stamp* *_magic.h sigfe.s cygwin.def globals.h
+	-rm -f *.o *.dll *.dbg *.a *.exp junk *.base version.cc regexp/*.o winver_stamp *.exe *.d *stamp* *_magic.h sigfe.s cygwin.def globals.h $(srcdir)/tlsoffsets.h $(srcdir)/devices.cc
 	-@$(MAKE) -C $(bupdir)/cygserver libclean
 
 maintainer-clean realclean: clean
diff --git a/winsup/cygwin/tlsoffsets.h b/winsup/cygwin/tlsoffsets.h
index d147c82f4..940d3fee9 100644
--- a/winsup/cygwin/tlsoffsets.h
+++ b/winsup/cygwin/tlsoffsets.h
@@ -1,6 +1,6 @@
 //;# autogenerated:  Do not edit.
 
-//; $tls::sizeof__cygtls = 4320;
+//; $tls::sizeof__cygtls = 4332;
 //; $tls::func = -12700;
 //; $tls::pfunc = 0;
 //; $tls::el = -12696;
@@ -39,30 +39,30 @@
 //; $tls::p__dontuse = 420;
 //; $tls::locals = -11192;
 //; $tls::plocals = 1508;
-//; $tls::_ctinfo = -9484;
-//; $tls::p_ctinfo = 3216;
-//; $tls::andreas = -9480;
-//; $tls::pandreas = 3220;
-//; $tls::wq = -9464;
-//; $tls::pwq = 3236;
-//; $tls::prev = -9436;
-//; $tls::pprev = 3264;
-//; $tls::next = -9432;
-//; $tls::pnext = 3268;
-//; $tls::sig = -9428;
-//; $tls::psig = 3272;
-//; $tls::incyg = -9424;
-//; $tls::pincyg = 3276;
-//; $tls::spinning = -9420;
-//; $tls::pspinning = 3280;
-//; $tls::stacklock = -9416;
-//; $tls::pstacklock = 3284;
-//; $tls::stackptr = -9412;
-//; $tls::pstackptr = 3288;
-//; $tls::stack = -9408;
-//; $tls::pstack = 3292;
-//; $tls::initialized = -8384;
-//; $tls::pinitialized = 4316;
+//; $tls::_ctinfo = -9472;
+//; $tls::p_ctinfo = 3228;
+//; $tls::andreas = -9468;
+//; $tls::pandreas = 3232;
+//; $tls::wq = -9452;
+//; $tls::pwq = 3248;
+//; $tls::prev = -9424;
+//; $tls::pprev = 3276;
+//; $tls::next = -9420;
+//; $tls::pnext = 3280;
+//; $tls::sig = -9416;
+//; $tls::psig = 3284;
+//; $tls::incyg = -9412;
+//; $tls::pincyg = 3288;
+//; $tls::spinning = -9408;
+//; $tls::pspinning = 3292;
+//; $tls::stacklock = -9404;
+//; $tls::pstacklock = 3296;
+//; $tls::stackptr = -9400;
+//; $tls::pstackptr = 3300;
+//; $tls::stack = -9396;
+//; $tls::pstack = 3304;
+//; $tls::initialized = -8372;
+//; $tls::pinitialized = 4328;
 //; __DATA__
 
 #define tls_func (-12700)
@@ -103,27 +103,27 @@
 #define tls_p__dontuse (420)
 #define tls_locals (-11192)
 #define tls_plocals (1508)
-#define tls__ctinfo (-9484)
-#define tls_p_ctinfo (3216)
-#define tls_andreas (-9480)
-#define tls_pandreas (3220)
-#define tls_wq (-9464)
-#define tls_pwq (3236)
-#define tls_prev (-9436)
-#define tls_pprev (3264)
-#define tls_next (-9432)
-#define tls_pnext (3268)
-#define tls_sig (-9428)
-#define tls_psig (3272)
-#define tls_incyg (-9424)
-#define tls_pincyg (3276)
-#define tls_spinning (-9420)
-#define tls_pspinning (3280)
-#define tls_stacklock (-9416)
-#define tls_pstacklock (3284)
-#define tls_stackptr (-9412)
-#define tls_pstackptr (3288)
-#define tls_stack (-9408)
-#define tls_pstack (3292)
-#define tls_initialized (-8384)
-#define tls_pinitialized (4316)
+#define tls__ctinfo (-9472)
+#define tls_p_ctinfo (3228)
+#define tls_andreas (-9468)
+#define tls_pandreas (3232)
+#define tls_wq (-9452)
+#define tls_pwq (3248)
+#define tls_prev (-9424)
+#define tls_pprev (3276)
+#define tls_next (-9420)
+#define tls_pnext (3280)
+#define tls_sig (-9416)
+#define tls_psig (3284)
+#define tls_incyg (-9412)
+#define tls_pincyg (3288)
+#define tls_spinning (-9408)
+#define tls_pspinning (3292)
+#define tls_stacklock (-9404)
+#define tls_pstacklock (3296)
+#define tls_stackptr (-9400)
+#define tls_pstackptr (3300)
+#define tls_stack (-9396)
+#define tls_pstack (3304)
+#define tls_initialized (-8372)
+#define tls_pinitialized (4328)