diff --git a/filesystem.spec b/filesystem.spec
index 8fbc744..73e35df 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,6 +1,6 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
-Version: 2.3.6
+Version: 2.3.7
 Release: 1
 License: Public Domain
 Group: System Environment/Base
@@ -25,7 +25,7 @@ mkdir -p mnt/{floppy,cdrom} \
 	bin boot \
 	etc/{X11/{applnk,sysconfig,serverconfig,starthere},opt,xinetd.d,skel,sysconfig,pki} \
 	home lib/modules %{_lib}/tls media mnt opt proc root sbin selinux srv sys tmp \
-	usr/{bin,etc,games,include,%{_lib}/{games,gcc-lib,tls},lib/{games,gcc-lib,locale},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{man/man{1,2,3,4,5,6,7,8,9,n},info},libexec,include,},sbin,share/{applications,doc,dict,games,info,man/man{1,2,3,4,5,6,7,8,9,n},doc,misc,empty,pixmaps,xsessions},src,X11R6/{bin,include,lib,%{_lib}/tls,man,share}} \
+        usr/{bin/X11,etc,games,include,%{_lib}/{games,gcc-lib,tls,X11},lib/{games,gcc-lib,locale,X11},libexec,local/{bin,etc,games,lib,%{_lib},sbin,src,share/{man/man{1,2,3,4,5,6,7,8,9,n},info},libexec,include,},sbin,share/{applications,doc,dict,games,info,man/man{1,2,3,4,5,6,7,8,9,n},doc,misc,empty,pixmaps,xsessions},src} \
         var/{empty,lib/{games,misc},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd},tmp,db,cache,opt,games,yp}
 
 ln -snf ../var/tmp usr/tmp
@@ -93,8 +93,13 @@ rm -rf %{buildroot}
 /var/yp
 
 %changelog
+* Thu Nov 17 2005 Bill Nottingham <notting@redhat.com> - 2.3.7-1
+- actually, *do* package /usr/lib/X11 and /usr/bin/X11, but as
+  directories (#173384)
+- remove /usr/X11R6 heirarchy
+
 * Mon Nov  7 2005 Bill Nottingham <notting@redhat.com> - 2.3.6-1
-- don't package /usr/lib/X11 or /usr/bin/X11
+- don't package /usr/lib/X11 or /usr/bin/X11 symlinks
 
 * Fri Aug 19 2005 Bill Nottingham <notting@redhat.com> - 2.3.5-1
 - package / (#165797)