diff --git a/libguestfs.changes b/libguestfs.changes
index 95f6300..2e254b4 100644
--- a/libguestfs.changes
+++ b/libguestfs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Sep 19 15:43:53 CEST 2013 - ohering@suse.de
+
+- Create symlink from /etc/mtab to /proc/self/mounts (bnc#840662)
+
 -------------------------------------------------------------------
 Mon Sep  2 13:59:21 CEST 2013 - dvaleev@suse.com
 
diff --git a/libguestfs.mkinitrd.boot.sh b/libguestfs.mkinitrd.boot.sh
index 5944886..2edf6e2 100644
--- a/libguestfs.mkinitrd.boot.sh
+++ b/libguestfs.mkinitrd.boot.sh
@@ -87,6 +87,7 @@
 #%programs: modprobe
 #%programs: lvm
 #%programs: grep
+#%programs: ln
 #%programs: ls
 #%programs: head
 #%programs: cat
@@ -112,6 +113,8 @@ missing_commands="@GUESTFS_MISSING_CMDS@"
 # run_all.sh will load them after this script is sourced
 load_modules
 
+ln -sfbn ../proc/self/mounts /etc/mtab
+
 # from libguestfs-1.19.34/appliance/init:
 
 # Disk optimizations.