diff --git a/config/chroot_local-includes/etc/skel/.config/autostart/iceweasel.desktop b/config/chroot_local-includes/etc/skel/.config/autostart/iceweasel.desktop
new file mode 120000
index 0000000000000000000000000000000000000000..f798478c2d711658d7dd721bc01aa7eafc57c164
--- /dev/null
+++ b/config/chroot_local-includes/etc/skel/.config/autostart/iceweasel.desktop
@@ -0,0 +1 @@
+/usr/share/applications/iceweasel.desktop
\ No newline at end of file
diff --git a/config/chroot_local-includes/usr/local/bin/end-profile b/config/chroot_local-includes/usr/local/bin/end-profile
index 44e04faab1d261906499aa627e877e807627ce72..5e7f31a8b02c2dd151bdf88312e56174a81f0cb1 100755
--- a/config/chroot_local-includes/usr/local/bin/end-profile
+++ b/config/chroot_local-includes/usr/local/bin/end-profile
@@ -4,12 +4,7 @@ set -e
 
 test -e /boot-profile.pid || exit 0
 
-# Wait some time hoping Tor will have bootstrapped
-sleep 60
-
-iceweasel &
-
-# Wait some time hoping Iceweasel will be started
-sleep 30
+# Wait some time hoping Tor has bootstrapped and Iceweasel is started
+sleep 90
 
 sudo kill $(cat /boot-profile.pid)
diff --git a/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn b/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn
index cc51fe369ece509cc931c79a510afc0eb93b4492..d83364e76cb14554e70d5b63af9252f2311eca6f 100644
--- a/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn
+++ b/wiki/src/bugs/iceweasel_1st_page_not_loaded.mdwn
@@ -2,3 +2,11 @@ When starting iceweasel for the 1st time under 0.6~rc2, the home page (or any
 page given at the command line) is not opened, but about:blank.
 
 If iceweasel was started once, then everything goes well.
+
+> This is now workaround'ed by autostarting Iceweasel with the GNOME
+> session: this way, clicking on a link found in one of our desktop
+> notifications / warnings, or on the T(A)ILS documentation desktop
+> icon, really opens the wanted page. OTOH, this first Iceweasel
+> instance doesn't load the check.torproject.org page, but as we are
+> considering removing it I guess we can nevertheless tag this bug 
+> [[!taglink pending]].