diff --git a/CHANGES b/CHANGES
index fcacd5b97..45697f3c3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,8 @@
 	New packages: tcpreplay, hostapd
 
 	Updated/fixed packages: autoconf, bind, binutils, busybox,
-	directfb, iw, libfuse, libpcap, lighttpd, mesa, pcre, usbutils
+	directfb, iw, libfuse, libpcap, lighttpd, mesa, pcre, sshfs,
+	usbutils
 
 	Issues resolved (http://bugs.uclibc.org):
 
diff --git a/package/Config.in b/package/Config.in
index ba0f96da1..6adf913d2 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -266,6 +266,7 @@ if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sfdisk/Config.in"
 endif
 source "package/smartmontools/Config.in"
+source "package/sshfs/Config.in"
 source "package/sysstat/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # mdev
diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in
new file mode 100644
index 000000000..12d98f6bc
--- /dev/null
+++ b/package/sshfs/Config.in
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_SSHFS
+	bool "sshfs (FUSE)"
+	select BR2_PACKAGE_LIBFUSE
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_GETTEXT
+	select BR2_PACKAGE_LIBINTL
+	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
+	depends on BR2_PACKAGE_OPENSSH
+	help
+	  FUSE makes it possible to implement a filesystem in a userspace
+	  program. Features include: simple yet comprehensive API, secure
+	  mounting by non-root users, support for 2.4 and 2.6 Linux
+	  kernels, multi-threaded operation. etc...
+
+	  http://fuse.sourceforge.net/sshfs.html
+
+comment "sshfs requires a toolchain with LARGEFILE support"
+        depends on !BR2_LARGEFILE
diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk
new file mode 100644
index 000000000..4acc2931e
--- /dev/null
+++ b/package/sshfs/sshfs.mk
@@ -0,0 +1,16 @@
+#############################################################
+#
+# sshfs
+#
+#############################################################
+
+SSHFS_VERSION:=2.2
+SSHFS_SOURCE:=sshfs-fuse-$(SSHFS_VERSION).tar.gz
+SSHFS_SITE=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/fuse/$(SSHFS_VERSION)/sshfs-fuse
+SSHFS_AUTORECONF:=NO
+SSHFS_INSTALL_STAGING:=NO
+SSHFS_INSTALL_TARGET:=YES
+
+SSHFS_DEPENDENCIES = libglib2 libfuse
+
+$(eval $(call AUTOTARGETS,package,sshfs))