diff --git a/postlfs/filesystems/fuse2.xml b/archive/fuse2.xml
similarity index 100%
rename from postlfs/filesystems/fuse2.xml
rename to archive/fuse2.xml
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 90376de3cd..a9ffb62893 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -41,8 +41,20 @@
       </itemizedlist>
     </listitem>
 -->
-    <!-- First person to edit sysv applicable text needs to remove this rev tag
-         and put it into the para below. -->
+    <listitem>
+      <para>July 9th, 2017</para>
+      <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to fuse3-3.1.0. Archive fuse 2.9.x. Fixes
+         <ulink url="&blfs-ticket-root;9465">#9465</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to sshfs-3.0.0. Fixes
+         <ulink url="&blfs-ticket-root;9466">#9466</ulink>.</para>
+       </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem revision="systemd">
       <para>July 11th, 2017</para>
       <itemizedlist>
diff --git a/packages.ent b/packages.ent
index d090265d6b..175f25963a 100644
--- a/packages.ent
+++ b/packages.ent
@@ -50,8 +50,8 @@
 <!-- Chapter 5 -->
 <!ENTITY btrfs-progs-version          "4.11.1">
 <!ENTITY dosfstools-version           "4.1">
-<!ENTITY fuse3-version                "3.0.2">
-<!ENTITY fuse2-version                "2.9.7">
+<!ENTITY fuse3-version                "3.1.0">
+<!--<!ENTITY fuse2-version                "2.9.7">-->
 <!ENTITY jfsutils-version             "1.1.15">
 <!ENTITY lvm2-version                 "2.02.171">
 <!ENTITY mdadm-version                "4.0">
@@ -60,7 +60,7 @@
 <!ENTITY parted-version               "3.2">
 <!ENTITY reiser-version               "3.6.26">
 <!ENTITY smartmontools-version        "6.5">
-<!ENTITY sshfs-version                "2.9">
+<!ENTITY sshfs-version                "3.0.0">
 <!--<!ENTITY sshfs-fuse-download-version  "2_5">-->
 <!ENTITY xfsprogs-version             "4.11.0">
 
diff --git a/postlfs/filesystems/filesystems.xml b/postlfs/filesystems/filesystems.xml
index 216b5efe59..602e20541d 100644
--- a/postlfs/filesystems/filesystems.xml
+++ b/postlfs/filesystems/filesystems.xml
@@ -26,7 +26,7 @@ $Date$
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="btrfs-progs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="dosfstools.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fuse3.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fuse2.xml"/>
+<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="fuse2.xml"/>-->
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="jfs.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="lvm2.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutlvm.xml"/>
diff --git a/postlfs/filesystems/fuse3.xml b/postlfs/filesystems/fuse3.xml
index 8205fb66b2..fbac996649 100644
--- a/postlfs/filesystems/fuse3.xml
+++ b/postlfs/filesystems/fuse3.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY fuse3-download-http "https://github.com/libfuse/libfuse/releases/download/fuse-&fuse3-version;/fuse-&fuse3-version;.tar.gz">
   <!ENTITY fuse3-download-ftp  " ">
-  <!ENTITY fuse3-md5sum        "51e832a27095ca7c5d835dc0ecb01565">
-  <!ENTITY fuse3-size          "708 KB">
-  <!ENTITY fuse3-buildsize     "11 MB">
+  <!ENTITY fuse3-md5sum        "b63603701c9d1b4100d81c856a87ae1c">
+  <!ENTITY fuse3-size          "792 KB">
+  <!ENTITY fuse3-buildsize     "8.5 MB">
   <!ENTITY fuse3-time          "0.1 SBU">
 ]>
 
@@ -74,6 +74,14 @@
       </listitem>
     </itemizedlist>
 
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing='compact'>
+      <listitem>
+        <para>Required patch: <ulink
+          url="&patch-root;/fuse-&fuse3-version;-upstream_fix-1.patch"/></para>
+      </listitem>
+    </itemizedlist>
+
     <bridgehead renderas="sect3">Fuse Dependencies</bridgehead>
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
@@ -109,7 +117,9 @@
       commands:
     </para>
 
-<screen><userinput>./configure --prefix=/usr    \
+<screen><userinput>patch -Np1 -i ../fuse-3.1.0-upstream_fix-1.patch &amp;&amp;
+
+./configure --prefix=/usr    \
             --disable-static \
             --exec-prefix=/  \
             --with-pkgconfigdir=/usr/lib/pkgconfig \
diff --git a/postlfs/filesystems/ntfs-3g.xml b/postlfs/filesystems/ntfs-3g.xml
index 7f36e72e38..1e8e51229f 100644
--- a/postlfs/filesystems/ntfs-3g.xml
+++ b/postlfs/filesystems/ntfs-3g.xml
@@ -80,7 +80,8 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="fuse2"/> (this disables user mounts)
+      <ulink url="https://github.com/libfuse/libfuse">fuse 2.x</ulink> 
+         (this disables user mounts)
     </para>
 
     <para condition="html" role="usernotes">
diff --git a/postlfs/filesystems/sshfs.xml b/postlfs/filesystems/sshfs.xml
index f22ffa0ff1..01b775e1bc 100644
--- a/postlfs/filesystems/sshfs.xml
+++ b/postlfs/filesystems/sshfs.xml
@@ -7,9 +7,9 @@
   <!ENTITY sshfs-download-http
     "https://github.com/libfuse/sshfs/releases/download/sshfs-&sshfs-version;/sshfs-&sshfs-version;.tar.gz">
   <!ENTITY sshfs-download-ftp  " ">
-  <!ENTITY sshfs-md5sum        "6ac4a441ae86d9b7b41021555e11e654">
-  <!ENTITY sshfs-size          "152 KB">
-  <!ENTITY sshfs-buildsize     "1.8 MB">
+  <!ENTITY sshfs-md5sum        "995b7503ac99e9b877f9c6c12e2fd8aa">
+  <!ENTITY sshfs-size          "160 KB">
+  <!ENTITY sshfs-buildsize     "1.0 MB">
   <!ENTITY sshfs-time          "less than 0.1 SBU">
 ]>
 
@@ -39,6 +39,7 @@
     </para>
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -78,7 +79,7 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="fuse2"/>,
+      <xref linkend="fuse3"/>,
       <xref linkend="glib2"/>, and
       <xref linkend="openssh"/>.
     </para>
@@ -119,7 +120,7 @@ make</userinput></screen>
       directory must exist and you must have permissions to write to it):
     </para>
 
-<screen><userinput>sshfs HOSTNAME:/home/user ~/MOUNTPATH</userinput></screen>
+<screen><userinput>sshfs HOSTNAME:/home/userd ~/MOUNTPATH</userinput></screen>
 
     <para>
       When you've finished work and want to unmount it again: