diff --git a/system/base/baselayout/actions.py b/system/base/baselayout/actions.py
index 92d58b33..9793ec68 100644
--- a/system/base/baselayout/actions.py
+++ b/system/base/baselayout/actions.py
@@ -19,15 +19,24 @@ def install():
 
     # Install everything
     pisitools.insinto("/", "root/*")
-    
+
     # Install baselayout utilities
     shelltools.cd("src/")
     autotools.rawInstall('DESTDIR="%s"' % get.installDIR())
-    
+
+    shelltools.system("ls")
+
+    # Dirty fix for now... (especially for flatpak)
+    shelltools.system("mv %s/run/* %s/dev" % (get.installDIR(), get.installDIR()))
+    pisitools.remove("/var/lock")
+    # shelltools.cd("%s/var" % get.installDIR())
+    shelltools.system("ln -rs %s/dev/lock %s/var/lock" % (get.installDIR(), get.installDIR()))
+    # shelltools.cd("%s/baselayout/src" % get.workDIR())
+
     # Adjust permissions
     chmod("/tmp", 01777)
     chmod("/var/tmp", 01777)
-    chmod("/run/shm", 01777)
+    chmod("/dev/shm", 01777)
     chmod("/var/lock", 0775)
     chmod("/usr/share/baselayout/shadow", 0600)
 
@@ -40,6 +49,6 @@ def install():
         pisitools.dosym("lib", "/lib64")
 
     pisitools.dosym("pisilinux-release", "/etc/system-release")
-    
+
     #File conflicts:
     pisitools.removeDir("/usr/share/man/man4")
diff --git a/system/base/baselayout/files/baselayout.conf b/system/base/baselayout/files/baselayout.conf
index 5c3a8960..9789a25b 100644
--- a/system/base/baselayout/files/baselayout.conf
+++ b/system/base/baselayout/files/baselayout.conf
@@ -2,6 +2,6 @@ f /run/utmp 0664 root utmp
 d /run/lock 0755 root lock
 d /run/lock/subsys 0755 root root
 d /run/pisilinux 0755 root root
-d /run/shm 1777 root root
-L /dev/shm - - - - /run/shm
+d /dev/shm 1777 root root
+L /run/shm - - - - /dev/shm
 d /run/user 0755 root root
diff --git a/system/base/baselayout/pspec.xml b/system/base/baselayout/pspec.xml
index 4d2ebbde..8eeb37f7 100644
--- a/system/base/baselayout/pspec.xml
+++ b/system/base/baselayout/pspec.xml
@@ -70,6 +70,13 @@
     </Package>
 
     <History>
+        <Update release="14">
+            <Date>2021-06-09</Date>
+            <Version>3.10.1</Version>
+            <Comment>Rebuild</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
         <Update release="13">
             <Date>2021-02-12</Date>
             <Version>3.10.1</Version>
diff --git a/system/base/fuse/actions.py b/system/base/fuse/actions.py
index 6f5f928c..e0b4a8fc 100644
--- a/system/base/fuse/actions.py
+++ b/system/base/fuse/actions.py
@@ -9,18 +9,18 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import shelltools
 
 def setup():
+    shelltools.export("MOUNT_FUSE_PATH", "/usr/bin")
     shelltools.system("sh makeconf.sh")
-    
+
     # Disable device node creation during build/install
-    pisitools.dosed("util/Makefile.in", "mknod", "echo Disabled: mknod ")
+    # pisitools.dosed("util/Makefile.in", "mknod", "echo Disabled: mknod ")
 
-
-    autotools.configure("--disable-static \
-                         --disable-rpath \
+    autotools.configure("--prefix=/usr \
+                         --libdir=/usr/lib \
                          --enable-lib \
                          --enable-util \
-                         --exec-prefix=/ \
-                         --bindir=/bin")
+                         --disable-example \
+                         --disable-static")
 
 def build():
     autotools.make()
@@ -28,14 +28,25 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
 
+    pisitools.dodir("/lib")
+    pisitools.domove("/usr/lib/libfuse.so.*", "/lib/")
+    shelltools.system("ln -sfv %s/lib/libfuse.so.%s %s/usr/lib/libfuse.so" % (get.installDIR(), get.srcVERSION(), get.installDIR()))
+
+    shelltools.system("install -v -m755 -d %s/usr/share/doc/fuse-%s" % (get.installDIR(), get.srcVERSION()))
+    shelltools.system("install -v -m644 doc/kernel.txt %s/usr/share/doc/fuse" % get.installDIR())
+    # shelltools.system("cp -Rv doc/html %s/usr/share/doc/fuse-%s" % (get.installDIR(), get.srcVERSION()))
+
+    pisitools.remove("/usr/lib/libfuse.la")
+    pisitools.remove("/usr/lib/libulockmgr.la")
+
     pisitools.removeDir("/dev")
-    pisitools.removeDir("/etc")
+    # pisitools.removeDir("/etc")
 
     # Make compat symlinks into /usr/bin
-    pisitools.dosym("/bin/fusermount", "/usr/bin/fusermount")
-    pisitools.dosym("/bin/ulockmgr_server", "/usr/bin/ulockmgr_server")
+    # pisitools.dosym("/bin/fusermount", "/usr/bin/fusermount")
+    # pisitools.dosym("/bin/ulockmgr_server", "/usr/bin/ulockmgr_server")
 
     # Move pkgconfig file to /usr/lib
-    pisitools.domove("/lib/pkgconfig", "/usr/lib/")
+    # pisitools.domove("/lib/pkgconfig", "/usr/lib/")
 
     pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "NEWS", "README.NFS")
diff --git a/system/base/fuse/pspec.xml b/system/base/fuse/pspec.xml
index 48cb812f..527d6e92 100644
--- a/system/base/fuse/pspec.xml
+++ b/system/base/fuse/pspec.xml
@@ -17,7 +17,7 @@
             <Dependency>gettext-devel</Dependency>
         </BuildDependencies>
         <Patches>
-            <Patch>skip_umount_test.patch</Patch>
+            <!--Patch>skip_umount_test.patch</Patch-->
         </Patches>
     </Source>
 
@@ -27,10 +27,10 @@
             <Dependency>glibc</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/bin</Path>
-            <Path fileType="executable">/sbin</Path>
+            <Path fileType="data">/etc</Path>
             <Path fileType="executable">/usr/bin</Path>
             <Path fileType="library">/lib</Path>
+            <Path fileType="library">/usr/lib/lib*.so*</Path>
             <Path fileType="doc">/usr/share/doc</Path>
             <Path fileType="man">/usr/share/man</Path>
         </Files>
@@ -50,6 +50,13 @@
     </Package>
 
     <History>
+        <Update release="6">
+            <Date>2021-06-09</Date>
+            <Version>2.9.9</Version>
+            <Comment>Rebuild.</Comment>
+            <Name>Berk Çakar</Name>
+            <Email>berk2238@hotmail.com</Email>
+        </Update>
         <Update release="6">
             <Date>2020-12-09</Date>
             <Version>2.9.9</Version>