diff --git a/lib/.directory b/lib/.directory
new file mode 100644
index 0000000..402ca63
--- /dev/null
+++ b/lib/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+PreviewsShown=true
+Timestamp=2018,2,7,12,14,19
+Version=4
diff --git a/lib/util-base.sh b/lib/util-base.sh
index fd3fbb4..a0e64d1 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -673,6 +673,8 @@ generate_fstab() {
             [[ -f ${MOUNTPOINT}/swapfile ]] && sed -i "s/\\${MOUNTPOINT}//" ${MOUNTPOINT}/etc/fstab
         fi
     fi
+    # Edit fstab in case of btrfs subvolumes
+    sed -i "s/subvolid=.*,subvol=\/.*,//g" /mnt/etc/fstab
 }
 
 # locale array generation code adapted from the Manjaro 0.8 installer