@@ -51,11 +51,16 @@
 	set cpuTeapotToLocal(ix86) x86
 	set cpuTeapotToLocal(sparc) sun4*
 	set cpuTeapotToLocal(universal) *
 	set cpuTeapotToLocal(powerpc) ppc
 
-	proc download_extensions {rootdir servers extensions os cpu {existingExts "Tcl Tk"}} {
+	proc download_extensions {rootdir servers extensions os cpu {existingExts ""}} {
+		foreach chkdefext [list Tcl Tk] {
+			if {[lsearch -exact $existingExts $chkdefext] == -1} {
+				lappend existingExts $chkdefext
+			}
+		}
 		foreach server $servers {
 			foreach {pkg pkginfo} [get_extensions $server $os $cpu] {
 				foreach pkginstance $pkginfo {
 					lappend pkginstance $server
 					lappend pkgdata($pkg) $pkginstance
@@ -79,11 +84,11 @@
 
 			set ver [lindex $pkginfo 0]
 			set arch [lindex $pkginfo 1]
 			set server [lindex $pkginfo 2]
 
-			set pkgdir [file join $rootdir lib $extension$ver]
+			set pkgdir [file join $rootdir $extension$ver]
 			file mkdir $pkgdir $::teapotclient::pkgcachedir
 
 			set url "http://$server/package/name/$extension/ver/$ver/arch/$arch/file"
 			set urlcachefile [file join $::teapotclient::pkgcachedir [::md5::md5 -hex $url]]