diff --git a/profiles/updates/1Q-2016 b/profiles/updates/1Q-2016
index cd9ffc6c5c68d..a4df49a2c9aaa 100644
--- a/profiles/updates/1Q-2016
+++ b/profiles/updates/1Q-2016
@@ -30,3 +30,4 @@ move dev-perl/net-ssh-perl dev-perl/Net-SSH-Perl
 move dev-perl/DateManip dev-perl/Date-Manip
 move dev-perl/wxperl dev-perl/Wx
 slotmove sys-devel/binutils 0 2.25.1
+move sys-fs/sshfs-fuse sys-fs/sshfs
diff --git a/sys-fs/sshfs-fuse/Manifest b/sys-fs/sshfs/Manifest
similarity index 100%
rename from sys-fs/sshfs-fuse/Manifest
rename to sys-fs/sshfs/Manifest
diff --git a/sys-fs/sshfs-fuse/metadata.xml b/sys-fs/sshfs/metadata.xml
similarity index 100%
rename from sys-fs/sshfs-fuse/metadata.xml
rename to sys-fs/sshfs/metadata.xml
diff --git a/sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild b/sys-fs/sshfs/sshfs-2.5.ebuild
similarity index 88%
rename from sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
rename to sys-fs/sshfs/sshfs-2.5.ebuild
index 917ae71458af7..6f3f9d6cec985 100644
--- a/sys-fs/sshfs-fuse/sshfs-fuse-2.5.ebuild
+++ b/sys-fs/sshfs/sshfs-2.5.ebuild
@@ -4,9 +4,12 @@
 
 EAPI="4"
 
+MY_PN=sshfs-fuse
+MY_P=${MY_PN}-${PV}
+
 DESCRIPTION="Fuse-filesystem utilizing the sftp service"
 HOMEPAGE="https://github.com/libfuse/sshfs"
-SRC_URI="https://github.com/libfuse/sshfs/releases/download/sshfs-${PV//./_}/${P}.tar.gz"
+SRC_URI="https://github.com/libfuse/sshfs/releases/download/sshfs-${PV//./_}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 arm hppa ~ppc ~ppc64 x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
@@ -19,6 +22,8 @@ RDEPEND="${CDEPEND}
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 
+S=${WORKDIR}/${MY_P}
+
 DOCS=( README NEWS ChangeLog AUTHORS FAQ.txt )
 
 src_configure() {