diff --git a/filesystem.spec b/filesystem.spec
index 070a54a..f874887 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -39,7 +39,7 @@ mkdir -p boot dev \
         etc/{X11/{applnk,fontpath.d},xdg/autostart,opt,pm/{config.d,power.d,sleep.d},xinetd.d,skel,sysconfig,pki,bash_completion.d} \
         home media mnt opt proc root run/lock srv sys tmp \
         usr/{bin,etc,games,include,%{_lib}/{games,sse2,tls,X11,pm-utils/{module.d,power.d,sleep.d}},lib/{debug,games,locale,modules,sse2},libexec,local/{bin,etc,games,lib,%{_lib},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,applications,augeas/lenses,backgrounds,desktop-directories,dict,doc,empty,games,ghostscript/conf.d,gnome,icons,idl,info,man/man{1,2,3,4,5,6,7,8,9,n,1x,2x,3x,4x,5x,6x,7x,8x,9x,0p,1p,3p},mime-info,misc,omf,pixmaps,sounds,themes,xsessions,X11},src,src/kernels,src/debug} \
-        var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,log,nis,preserve,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
+        var/{adm,empty,gopher,lib/{games,misc,rpm-state},local,lock/subsys,log,nis,preserve,run,spool/{mail,lpd,uucp},tmp,db,cache,opt,games,yp}
 
 #do not create the symlink atm.
 #ln -snf etc/sysconfig etc/default
@@ -47,15 +47,8 @@ ln -snf ../var/tmp usr/tmp
 ln -snf spool/mail var/mail
 ln -snf usr/bin bin
 ln -snf usr/sbin sbin
-%ifarch aarch64
-ln -snf usr/%{_lib} lib
-%else
 ln -snf usr/lib lib
-%endif
 ln -snf usr/%{_lib} %{_lib}
-ln -snf ../run var/run
-ln -snf ../run/lock var/lock
-mkdir var/lock/subsys
 
 sed -n -f %{buildroot}/iso_639.sed /usr/share/xml/iso-codes/iso_639.xml \
   >%{buildroot}/iso_639.tab
@@ -138,6 +131,10 @@ end
 
 return 0
 
+%post -p <lua>
+posix.symlink("../run", "/var/run")
+posix.symlink("../run/lock", "/var/lock")
+
 %files -f filelist
 %defattr(0755,root,root,-)
 %dir %attr(555,root,root) /
@@ -224,14 +221,14 @@ return 0
 /var/gopher
 /var/lib
 /var/local
-%attr(755,root,root) /var/lock
+%ghost %dir %attr(755,root,root) /var/lock
 %ghost /var/lock/subsys
 /var/log
 /var/mail
 /var/nis
 /var/opt
 /var/preserve
-%attr(755,root,root) /var/run
+%ghost %attr(755,root,root) /var/run
 %dir /var/spool
 %attr(755,root,root) /var/spool/lpd
 %attr(775,root,mail) /var/spool/mail
@@ -240,7 +237,14 @@ return 0
 /var/yp
 
 %changelog
-* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-10
+* Mon Apr 08 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-10
+- do not handle AArch64 differently (#917804)
+
+* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-9
+- revert the change for previous build, breaking koji
+  builds
+
+* Mon Mar 18 2013 Ondrej Vasik <ovasik@redhat.com> 3.2-8
 - ship /var/run and /var/lock as symlinks in payload,
   don't handle them as part of post scriptlet (#919374)