diff --git a/src/freedombone-app-tahoelafs b/src/freedombone-app-tahoelafs
index 8e12d9798c0c92deb0c80fae35cd6bd67d8e9e32..6061d53441a8b9f92fcadb79383c783166ab775e 100755
--- a/src/freedombone-app-tahoelafs
+++ b/src/freedombone-app-tahoelafs
@@ -141,6 +141,7 @@ function remove_tahoelafs {
     function_check save_firewall_settings
     save_firewall_settings
 
+    pip uninstall tahoe-lafs
     apt-get -y remove --purge tahoe-lafs
 
     sed -i '/install_tahoelafs/d' $COMPLETION_FILE
@@ -207,7 +208,8 @@ function tahoelafs_update_script {
 }
 
 function mesh_install_tahoelafs {
-    chroot "$rootdir" apt-get -y install tahoe-lafs
+    chroot "$rootdir" apt-get -y install python-pip tahoe-lafs
+    chroot "$rootdir" pip install tahoe-lafs
     chroot "$rootdir" su -c 'tahoe create-client' - $MY_USERNAME
     if [ ! -d $rootdir/home/$MY_USERNAME/.tahoe ]; then
         exit 63722
@@ -229,7 +231,8 @@ function install_tahoelafs {
         return
     fi
 
-    apt-get -y install tahoe-lafs
+    apt-get -y install python-pip tahoe-lafs
+    pip install tahoe-lafs
     configure_firewall_for_tahoelafs
     reconfigure_tahoelafs
     tahoelafs_update_script /usr/bin/update-tahoelafs
diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh
index be40274fa93e12eea0d2e63587850a757200dcb0..a34fe8e58fe5219b0ae6af48f0354441496cc25c 100755
--- a/src/freedombone-image-mesh
+++ b/src/freedombone-image-mesh
@@ -522,6 +522,9 @@ function show_desktop_icons {
     chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
     chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/*.sh
 
+    # link to Tahoe-LAFS Magic folder
+    ln -s /home/${MY_USERNAME}/Desktop/${TAHOELAFS_SHARED_DIR} /home/${MY_USERNAME}/${TAHOELAFS_SHARED_DIR}
+
     # restart caja
     killall caja
     killall mate-panel