diff --git a/www/shttpd/Makefile b/www/shttpd/Makefile
new file mode 100644
index 00000000000..e8d3b4eea0e
--- /dev/null
+++ b/www/shttpd/Makefile
@@ -0,0 +1,32 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2001/03/22 15:04:11 camield Exp $
+COMMENT=		HTTP daemons designed to complement publicfile
+
+DISTNAME=		shttpd-0.52
+HOMEPAGE=		http://www.superscript.com/shttpd/intro.html
+
+CATEGORIES=		www
+NEED_VERSION=		1.340
+MAINTAINER=		David Lebel <lebel@lebel.org>
+
+MASTER_SITES=		http://www.superscript.com/shttpd/
+
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+ALL_TARGET=		default
+INSTALL_TARGET=		setup check
+
+RUN_DEPENDS=		supervise::sysutils/daemontools \
+			tcpserver::net/ucspi-tcp \
+			${LOCALBASE}/publicfile/bin/httpd::net/publicfile
+
+pre-build:
+	@echo ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
+	@echo ${PREFIX}/shttpd > ${WRKSRC}/conf-home
+
+pre-install:
+	@echo ${PREFIX}/shttpd > ${WRKSRC}/conf-home
+
+.include <bsd.port.mk>
diff --git a/www/shttpd/files/md5 b/www/shttpd/files/md5
new file mode 100644
index 00000000000..acc567051e6
--- /dev/null
+++ b/www/shttpd/files/md5
@@ -0,0 +1,3 @@
+MD5 (shttpd-0.52.tar.gz) = da5db6e97326bdf092fa979e31f1ef5a
+RMD160 (shttpd-0.52.tar.gz) = 21a682442b5bfb7890ecf6dbd9a3dbce8cde4134
+SHA1 (shttpd-0.52.tar.gz) = b4a01fd030594103d598a50d4ebc98518a09348d
diff --git a/www/shttpd/patches/patch-Makefile b/www/shttpd/patches/patch-Makefile
new file mode 100644
index 00000000000..22968c7a058
--- /dev/null
+++ b/www/shttpd/patches/patch-Makefile
@@ -0,0 +1,25 @@
+$OpenBSD: patch-Makefile,v 1.1.1.1 2001/03/22 15:04:11 camield Exp $
+
+Needed for fake installation. This way the installer can easily be
+rebuilt with the fake prefix, without rebuilding _everything_.
+
+--- Makefile.orig	Mon Jul 17 18:25:33 2000
++++ Makefile	Wed Mar 21 10:59:42 2001
+@@ -6,7 +6,7 @@ default: it
+ 
+ 
+ setup: \
+-it install
++install
+ 	./install
+ 
+ load: \
+@@ -1000,7 +1000,7 @@ strerr.h error.h readwrite.h exit.h
+ 	./compile instcheck.c
+ 
+ check: \
+-it instcheck
++instcheck
+ 	./instcheck
+ 
+ rts: \
diff --git a/www/shttpd/pkg/DESCR b/www/shttpd/pkg/DESCR
new file mode 100644
index 00000000000..52f7831d801
--- /dev/null
+++ b/www/shttpd/pkg/DESCR
@@ -0,0 +1,16 @@
+echo-httpd, redir-httpd, and cgi-httpd are HTTP daemons designed
+to complement publicfile.
+
+* echo-httpd echos HTTP requests. 
+* echo-config configures echo-httpd. 
+* redir-httpd redirects HTTP requests via cdb lookup. 
+* redir-config configures redir-httpd. 
+* cgi-httpd executes a cgi script. 
+* cgi-config configures cgi-httpd. 
+* constant-httpd prints the same file for each HTTP request. 
+* constant-config configures constant-httpd. 
+
+Each instance of an shttpd daemon listens on a separate address,
+in a chroot directory, typically running as a nonprivileged user.
+
+WWW: ${HOMEPAGE}
diff --git a/www/shttpd/pkg/PLIST b/www/shttpd/pkg/PLIST
new file mode 100644
index 00000000000..eca47094bd1
--- /dev/null
+++ b/www/shttpd/pkg/PLIST
@@ -0,0 +1,10 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2001/03/22 15:04:11 camield Exp $
+shttpd/bin/cgi-config
+shttpd/bin/cgi-httpd
+shttpd/bin/cgi-success
+shttpd/bin/constant-config
+shttpd/bin/constant-httpd
+shttpd/bin/echo-config
+shttpd/bin/echo-httpd
+shttpd/bin/redir-config
+shttpd/bin/redir-httpd