diff --git a/sysutils/tentakel/Makefile b/sysutils/tentakel/Makefile
index 1b4d157f51e..3f24e52e7be 100644
--- a/sysutils/tentakel/Makefile
+++ b/sysutils/tentakel/Makefile
@@ -1,21 +1,21 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/08 08:22:43 steven Exp $
+# $OpenBSD: Makefile,v 1.9 2009/02/08 22:42:56 sthen Exp $
 
 COMMENT=	distributed command execution
 
-DISTNAME=	tentakel-2.1.2
-PKGNAME=	${DISTNAME}p1
+DISTNAME=	tentakel-357
 CATEGORIES=	sysutils
 MAINTAINER=	Sebastian Stark <seb@todesplanet.de>
 HOMEPAGE=	http://tentakel.biskalar.de/
 
+MODPY_EGG_VERSION = 2.2.1
+
 # BSD + LGPL
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tentakel/}
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	http://spacehopper.org/mirrors/
 
 MODULES=	lang/python
 
diff --git a/sysutils/tentakel/distinfo b/sysutils/tentakel/distinfo
index c495f868f60..232c037b26c 100644
--- a/sysutils/tentakel/distinfo
+++ b/sysutils/tentakel/distinfo
@@ -1,5 +1,5 @@
-MD5 (tentakel-2.1.2.tgz) = lbPmjh78yKMWhjRPETamHg==
-RMD160 (tentakel-2.1.2.tgz) = YV5yXuKqHWSz/hAWI50LjJdckgQ=
-SHA1 (tentakel-2.1.2.tgz) = Z+FcvXut03go3k/FkUUdf7lWBTo=
-SHA256 (tentakel-2.1.2.tgz) = MVImRefZZmXcMUlvqeqkwQWm7Y65UvOFRyPfqEV46g8=
-SIZE (tentakel-2.1.2.tgz) = 27167
+MD5 (tentakel-357.tar.gz) = 0qkpXjRRZZd7qhPR2pVxww==
+RMD160 (tentakel-357.tar.gz) = 2irhLEbdk1PqHfajINSJevRceKM=
+SHA1 (tentakel-357.tar.gz) = XIusbHswJ7fLTLKeIlmAb2gG9Zg=
+SHA256 (tentakel-357.tar.gz) = Qv+PWVc+7jp4IelBaCKwqUqmmFRN+inQqwuq6Cl7Yh8=
+SIZE (tentakel-357.tar.gz) = 51794
diff --git a/sysutils/tentakel/patches/patch-py_lekatnet_remote_py b/sysutils/tentakel/patches/patch-py_lekatnet_remote_py
deleted file mode 100644
index 541d4e3ec0a..00000000000
--- a/sysutils/tentakel/patches/patch-py_lekatnet_remote_py
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-py_lekatnet_remote_py,v 1.1 2004/01/18 14:10:40 wilfried Exp $
---- py/lekatnet/remote.py.orig	2004-01-17 19:50:46.000000000 +0100
-+++ py/lekatnet/remote.py	2004-01-18 15:04:44.000000000 +0100
-@@ -174,7 +174,9 @@ if __name__ == "__main__":
- 	print "self testing..."
- 
- 	print "### instantiate RemoteCommand:"
--	r = RemoteCommand(user="seb", destination="localhost")
-+	import pwd, os
-+	user = pwd.getpwuid(os.geteuid())[0]
-+	r = RemoteCommand(user=user, destination="localhost")
- 	if isinstance(r, RemoteCommand):
- 		print "OK"
- 	else:
diff --git a/sysutils/tentakel/patches/patch-py_setup_py b/sysutils/tentakel/patches/patch-py_setup_py
index fd6f072ad2c..868b23dda82 100644
--- a/sysutils/tentakel/patches/patch-py_setup_py
+++ b/sysutils/tentakel/patches/patch-py_setup_py
@@ -1,16 +1,16 @@
-$OpenBSD: patch-py_setup_py,v 1.1 2004/04/18 19:14:38 xsa Exp $
---- py/setup.py.orig	2004-01-17 19:54:19.000000000 +0100
-+++ py/setup.py	2004-04-11 01:42:54.000000000 +0200
-@@ -18,8 +18,8 @@ setup(
- 	packages = ["lekatnet"],
+$OpenBSD: patch-py_setup_py,v 1.2 2009/02/08 22:42:56 sthen Exp $
+--- py/setup.py.orig	Sun Feb  8 12:23:08 2009
++++ py/setup.py	Sun Feb  8 12:24:10 2009
+@@ -16,9 +16,8 @@ setup(
+ 	packages = ["lekatnet", "lekatnet.plugins"],
  	scripts = ["tentakel"],
  	data_files = [	("man/man1", ["../tentakel.1"]),
 -			("share/doc/tentakel", ["../tentakel.conf.example",
 -						"../README",
--						"../TODO",
--						"../tentakel.1.html"]) ]
++			("share/examples/tentakel", ["../tentakel.conf.example"]),
 +			("share/doc/tentakel", ["../README",
-+						"../TODO"]),
-+			("share/examples/tentakel", 
-+				["../tentakel.conf.example"]) ]
+ 						"../TODO",
+-						"../PLUGINS",
+-						"../tentakel.1.html"]) ]
++						"../PLUGINS"]) ]
  )
diff --git a/sysutils/tentakel/pkg/PLIST b/sysutils/tentakel/pkg/PLIST
index 1c1b96f1e9a..b4b3dbd2347 100644
--- a/sysutils/tentakel/pkg/PLIST
+++ b/sysutils/tentakel/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2004/08/09 08:44:52 xsa Exp $
+@comment $OpenBSD: PLIST,v 1.5 2009/02/08 22:42:56 sthen Exp $
 bin/tentakel
 lib/python${MODPY_VERSION}/site-packages/lekatnet/
 lib/python${MODPY_VERSION}/site-packages/lekatnet/__init__.py
@@ -7,14 +7,23 @@ lib/python${MODPY_VERSION}/site-packages/lekatnet/config.py
 lib/python${MODPY_VERSION}/site-packages/lekatnet/config.pyc
 lib/python${MODPY_VERSION}/site-packages/lekatnet/error.py
 lib/python${MODPY_VERSION}/site-packages/lekatnet/error.pyc
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/__init__.py
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/rsh.py
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/rsh.pyc
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/ssh.py
+lib/python${MODPY_VERSION}/site-packages/lekatnet/plugins/ssh.pyc
 lib/python${MODPY_VERSION}/site-packages/lekatnet/remote.py
 lib/python${MODPY_VERSION}/site-packages/lekatnet/remote.pyc
 lib/python${MODPY_VERSION}/site-packages/lekatnet/shell.py
 lib/python${MODPY_VERSION}/site-packages/lekatnet/shell.pyc
 lib/python${MODPY_VERSION}/site-packages/lekatnet/tpg.py
 lib/python${MODPY_VERSION}/site-packages/lekatnet/tpg.pyc
+lib/python${MODPY_VERSION}/site-packages/tentakel-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 @man man/man1/tentakel.1
 share/doc/tentakel/
+share/doc/tentakel/PLUGINS
 share/doc/tentakel/README
 share/doc/tentakel/TODO
 share/examples/tentakel/