diff --git a/debian.conf b/debian.conf
index d38269e..71af555 100644
--- a/debian.conf
+++ b/debian.conf
@@ -28,6 +28,15 @@ CMDLINE="rootwait ro console=tty0 vram=12M ubi.mtd=5"
 # The default value is the swap slice on the internal eMMC as used by Maemo by default
 SWAPDEVICE=/dev/mmcblk1p3
 
+# Automatically mount Fremantle file systems under /srv/fremantle
+MOUNTFREMANTLE=y
+
+# The Fremantle /home device to specify in fstab(5)
+HOMEDEVICE=/dev/mmcblk1p2
+
+# The Fremantle /home/user/MyDocs device to specify in fstab(5)
+MYDOCSDEVICE=/dev/mmcblk1p1
+
 # The bootmenu item file prefix number
 BOOTSEQUENCE=30
 
diff --git a/install_debian.sh b/install_debian.sh
index ca10192..b659910 100755
--- a/install_debian.sh
+++ b/install_debian.sh
@@ -42,6 +42,9 @@ test -r $DIR/debian.conf.local && . $DIR/debian.conf.local
 : $HOSTNAME
 : $CMDLINE
 : $SWAPDEVICE
+: $MOUNTFREMANTLE
+: $HOMEDEVICE
+: $MYDOCSDEVICE
 : $BOOTSEQUENCE
 : $KEYMAP_URL
 : $XKB_URL
@@ -150,6 +153,16 @@ none	/tmp	tmpfs	noatime	0	0
 $SWAPDEVICE	none	swap	sw	0	0
 EOF
 
+if [ "x$MOUNTFREMANTLE" = xY ] || [ "x$MOUNTFREMANTLE" = xy ]; then
+	mkdir -p $MOUNTPOINT/srv/fremantle
+	cat << EOF >> $MOUNTPOINT/etc/fstab
+/dev/ubi0_0	/srv/fremantle	ubifs	defaults,noatime	0	0
+$HOMEDEVICE	/srv/fremantle/home	ext3	noatime,errors=continue,commit=1,data=writeback	0	0
+/srv/fremantle/home/opt	/srv/fremantle/opt	none	bind	0	0
+$MYDOCSDEVICE	/srv/fremantle/home/user/MyDocs	vfat	nodev,noexec,nosuid,noatime,nodiratime,utf8,uid=29999,shortname=mixed,dmask=000,fmask=0133,rodir	0	0
+EOF
+fi
+
 # Change power button behaviour
 if [ x${POWER_BUTTON_ACTION:-} != x ]; then
 	sed -i 's/\(action=\).*$/\1'$POWER_BUTTON_ACTION'/' $MOUNTPOINT/etc/acpi/events/powerbtn-acpi-support