diff --git a/config/etc/fstab b/config/etc/fstab
index 693db126a..a82aaeb94 100644
--- a/config/etc/fstab
+++ b/config/etc/fstab
@@ -11,3 +11,4 @@ devpts	/dev/pts	devpts   gid=4,mode=620  0     0
 shm	/dev/shm	tmpfs	defaults,size=25%	0	0
 none	/tmp		tmpfs	defaults,size=128M	0	0
 none	/var/log/rrd	tmpfs	defaults,size=64M	0	0
+none	/var/lock	tmpfs	defaults,size=32M	0	0
diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
index 632429fbb..1b2c1aa20 100755
--- a/config/rootfiles/updater/update.sh
+++ b/config/rootfiles/updater/update.sh
@@ -149,6 +149,15 @@ mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
 #
 grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
 #
+# Update fstab
+#
+grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
+echo shm	/dev/shm	tmpfs	defaults,size=25%	0	0 >> /tmp/fstab.tmp
+echo none	/tmp		tmpfs	defaults,size=128M	0	0 >> /tmp/fstab.tmp
+echo none	/var/log/rrd	tmpfs	defaults,size=64M	0	0 >> /tmp/fstab.tmp
+echo none	/var/lock	tmpfs	defaults,size=32M	0	0 >> /tmp/fstab.tmp
+mv /tmp/fstab.tmp /etc/fstab
+#
 # Change version of Pakfire.conf
 #
 sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf