diff --git a/package/Config.in b/package/Config.in
index cf2267e131..41dd75cc7c 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -15,6 +15,7 @@ source "package/nvram/Config.in"
 endmenu
 
 menu "Applications"
+source "package/autossh/Config.in"
 source "package/bitchx/Config.in"
 source "package/collectd/Config.in"
 source "package/cbtt/Config.in"
diff --git a/package/Makefile b/package/Makefile
index bf4a17697c..4719c3eb7b 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -11,6 +11,7 @@ package-$(BR2_PACKAGE_ARPTABLES) += arptables
 package-$(BR2_PACKAGE_ARPWATCH) += arpwatch
 package-$(BR2_PACKAGE_ASTERISK) += asterisk
 package-$(BR2_COMPILE_ATFTP) += atftp
+package-$(BR2_PACKAGE_AUTOSSH) += autossh
 package-$(BR2_COMPILE_AVAHI) += avahi
 package-$(BR2_COMPILE_BC) += bc
 package-$(BR2_COMPILE_BIND) += bind
diff --git a/package/autossh/Config.in b/package/autossh/Config.in
new file mode 100644
index 0000000000..492547f525
--- /dev/null
+++ b/package/autossh/Config.in
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_AUTOSSH
+	prompt "autossh........................... Auto handle ssh tunnels"
+	tristate
+	default m if CONFIG_DEVEL
+	help
+	      autossh is a program to start a copy of ssh and monitor it,
+	      restarting it as necessary should it die or stop passing traffic.
+
+	      http://www.harding.motd.ca/autossh/
diff --git a/package/autossh/Makefile b/package/autossh/Makefile
new file mode 100644
index 0000000000..2d6e539017
--- /dev/null
+++ b/package/autossh/Makefile
@@ -0,0 +1,39 @@
+# $Id$
+#
+# Adjust SSH below to suit.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=autossh
+PKG_VERSION:=1.3
+PKG_RELEASE:=1
+PKG_MD5SUM:=0e7ec62eeca5d1b197f3ef2d0f0d417f
+PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_CAT:=zcat
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+VER=1.3
+SSH=/usr/bin/ssh
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,AUTOSSH,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured:
+	cp $(PKG_BUILD_DIR)/Makefile.linux $(PKG_BUILD_DIR)/Makefile
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC=$(TARGET_CC) CFLAGS="$(TARGET_CFLAGS) -Wall -D\"SSH_PATH=\\\"$(SSH)\\\"\" -D\"VER=\\\"$(PKG_VERSION)\\\"\"" \
+		BINDIR=/usr/bin MANDIR=/usr/man
+	touch $@
+
+$(IPKG_AUTOSSH):
+	mkdir -p $(IDIR_AUTOSSH)/usr/bin
+	cp $(PKG_BUILD_DIR)/$(PKG_NAME) $(IDIR_AUTOSSH)/usr/bin/
+	$(RSTRIP) $(IDIR_AUTOSSH)
+	$(IPKG_BUILD) $(IDIR_AUTOSSH) $(PACKAGE_DIR)
diff --git a/package/autossh/ipkg/autossh.control b/package/autossh/ipkg/autossh.control
new file mode 100644
index 0000000000..2916e3851e
--- /dev/null
+++ b/package/autossh/ipkg/autossh.control
@@ -0,0 +1,5 @@
+Package: autossh
+Priority: optional
+Section: net
+Depends: openssh-client
+Description: Autossh client