diff --git a/filesystem.spec b/filesystem.spec
index cb88f7f..6457200 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -42,11 +42,16 @@ install -p -c -m755 %SOURCE3 %{buildroot}/iso_3166.sed
 
 cd %{buildroot}
 
-mkdir -p afs boot dev \
+Paths=(
+        afs boot dev \
         etc/{X11/{applnk,fontpath.d,xinit/{xinitrc,xinput}.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},skel,sysconfig,pki,bash_completion.d,default,rwtab.d,statetab.d} \
         home media mnt opt root run srv tmp \
-        usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11/fonts,wayland-sessions},src,src/kernels,src/debug} \
+        usr/{bin,games,include,%{_lib}/{bpf,games,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug/{.dwz,usr},games,locale,modules,sysimage},libexec,local/{bin,etc,games,lib,%{_lib}/bpf,sbin,src,share/{applications,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x},info},libexec,include,},sbin,share/{aclocal,appdata,applications,augeas/lenses,backgrounds,bash-completion{,/completions,/helpers},desktop-directories,dict,doc,empty,fish/vendor_completions.d,games,gnome,help,icons,idl,info,licenses,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},metainfo,mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11/fonts,wayland-sessions,zsh/site-functions},src,src/kernels,src/debug} \
         var/{adm,empty,ftp,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd},tmp,db,cache/bpf,opt,games,yp}
+)
+for i in "${Paths[@]}"; do
+    mkdir -p "$i"
+done
 
 #do not create the symlink atm.
 #ln -snf etc/sysconfig etc/default
@@ -261,6 +266,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 /usr/share/dict
 /usr/share/doc
 %attr(555,root,root) %dir /usr/share/empty
+/usr/share/fish
 /usr/share/games
 /usr/share/gnome
 /usr/share/help
@@ -281,6 +287,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 %dir /usr/share/X11
 /usr/share/X11/fonts
 /usr/share/wayland-sessions
+/usr/share/zsh
 /usr/src
 /usr/tmp
 %dir /var
@@ -308,9 +315,12 @@ restorecon /afs 2>/dev/null >/dev/null || :
 
 %changelog
 * Tue Jun 25 2024 Martin Osvald <mosvald@redhat.com> - 3.16-3
-- Add ownership of /etc/default, /usr/share/X11/fonts
+- Add ownership of /etc/default, /usr/share/X11/fonts,
+  /usr/share/fish, /usr/share/zsh
+- Improve directory creation to avoid 'Argument list too long' error
   Resolves: RHEL-35327
   Resolves: RHEL-1337
+  Resolves: RHEL-1338
 
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.16-2
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
@@ -463,7 +473,7 @@ restorecon /afs 2>/dev/null >/dev/null || :
 * Sun Jun 30 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-17
 - .dwz symlink is needed as well (#974130)
 
-* Wed Jun 20 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-16
+* Thu Jun 20 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-16
 - /var/run and /var/lock can't be in payload for some reason
 
 * Wed Jun 19 2013 Ondrej Vasik <ovasik@redhat.com> - 3.2-15