diff --git a/www/thttpd/Makefile b/www/thttpd/Makefile
new file mode 100644
index 000000000000..8d444d8fe00d
--- /dev/null
+++ b/www/thttpd/Makefile
@@ -0,0 +1,68 @@
+# New ports collection makefile for: 	thttpd
+# Version required:	thttpd-2.04
+# Date created:		24 May 1999
+# Whom:			Anders Nordby <anders@fix.no>
+#
+# $Id$
+#
+
+DISTNAME=	thttpd-2.04
+CATEGORIES=	www
+MASTER_SITES=	http://www.acme.com/software/thttpd/ \
+		http://www.freenix.no/~anders/
+EXTRACT_SUFX=	.tar.Z
+
+MAINTAINER=	anders@fix.no
+
+NO_PACKAGE=     "Group needs to be created for users to have their own web dirs"
+
+GNU_CONFIGURE=	yes
+
+MAN1=		makeweb.1 htpasswd.1
+MAN8=		thttpd.8 nph-redirect.8 ssi.8 syslogtocern.8
+
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/thttpd ${PREFIX}/sbin/
+	@${INSTALL_MAN} ${WRKSRC}/thttpd.8 ${PREFIX}/man/man8
+	@${INSTALL} -d -o root -g wheel -m 0775 ${PREFIX}/www
+	@${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/www/cgi-bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/nph-redirect ${PREFIX}/www/cgi-bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/ssi ${PREFIX}/www/cgi-bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/cgi-src/phf ${PREFIX}/www/cgi-bin/
+	@${INSTALL_MAN} ${WRKSRC}/cgi-src/nph-redirect.8 ${PREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/cgi-src/ssi.8 ${PREFIX}/man/man8
+	@${INSTALL_PROGRAM} ${WRKSRC}/extras/makeweb ${PREFIX}/bin/
+	@${INSTALL} -c -m 755 -o root -g wheel ${WRKSRC}/extras/syslogtocern ${PREFIX}/bin/
+	@${INSTALL_PROGRAM} ${WRKSRC}/extras/htpasswd ${PREFIX}/bin/
+	@${INSTALL_MAN} ${WRKSRC}/extras/makeweb.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/extras/htpasswd.1 ${PREFIX}/man/man1
+	@${INSTALL_MAN} ${WRKSRC}/extras/syslogtocern.8 ${PREFIX}/man/man8
+
+post-install: message
+
+post-fetch: config-message
+
+post-build: config-message
+
+config-message:
+	@${ECHO} "====================================================================="
+	@${ECHO} ""
+	@${ECHO} "Be sure to take a look at the options in config.h before (re)building"
+	@${ECHO} "if you want to tweak the server."
+	@${ECHO} ""
+	@${ECHO} "====================================================================="
+
+message:
+	@${ECHO} "====================================================================="
+	@${ECHO} ""
+	@${ECHO} "If you want users to be able to create their own web subdirectories"
+	@${ECHO} "off of the main web directory, you need to:"
+	@${ECHO} ""
+	@${ECHO} "a) add a group for www admins"
+	@${ECHO} "b) chgrp yourgroup ${PREFIX}/bin/makeweb ${PREFIX}/www"
+	@${ECHO} "c) chmod 2755 ${PREFIX}/bin/makeweb"
+	@${ECHO} "d) tell them about makeweb(1)"
+	@${ECHO} ""
+	@${ECHO} "====================================================================="
+
+.include <bsd.port.mk>
diff --git a/www/thttpd/distinfo b/www/thttpd/distinfo
new file mode 100644
index 000000000000..da018115de24
--- /dev/null
+++ b/www/thttpd/distinfo
@@ -0,0 +1 @@
+MD5 (thttpd-2.04.tar.Z) = df4d68964ebe8d2d1b135db9b463b841
diff --git a/www/thttpd/pkg-comment b/www/thttpd/pkg-comment
new file mode 100644
index 000000000000..36faf9e8dd34
--- /dev/null
+++ b/www/thttpd/pkg-comment
@@ -0,0 +1 @@
+Tiny/turbo/throttling HTTP server.
diff --git a/www/thttpd/pkg-descr b/www/thttpd/pkg-descr
new file mode 100644
index 000000000000..d47449fb38e5
--- /dev/null
+++ b/www/thttpd/pkg-descr
@@ -0,0 +1,24 @@
+             thttpd - tiny/turbo/throttling HTTP server
+
+thttpd is a simple, small, portable, fast, and secure HTTP server. 
+
+Simple: It handles only the minimum necessary to implement HTTP/1.1.
+
+Small: See the size comparison chart at
+http://www.acme.com/software/thttpd/notes.html#sizes.  It also has a
+very small run-time size, since it does not fork and is very careful about
+memory allocation.
+
+Portable: It compiles cleanly on SunOS 4.1.x, Solaris 2.x, BSD/OS 2.x,
+Linux 1.2.x, and OSF/1 (on a 64-bit Alpha).
+
+Fast: In typical use it's about as fast as the best full-featured servers
+(Apache, NCSA, Netscape).  Under extreme load it's much faster.
+
+Secure: It goes to great lengths to protect the web server machine
+against attacks and breakins from other sites.
+
+It also has one extremely useful feature (URL-traffic-based throttling) that
+no other server currently has.
+
+WWW: http://www.acme.com/software/thttpd/
diff --git a/www/thttpd/pkg-plist b/www/thttpd/pkg-plist
new file mode 100644
index 000000000000..56aca6286cf5
--- /dev/null
+++ b/www/thttpd/pkg-plist
@@ -0,0 +1,9 @@
+bin/htpasswd
+bin/makeweb
+bin/syslogtocern
+sbin/thttpd
+www/cgi-bin/nph-redirect
+www/cgi-bin/phf
+www/cgi-bin/ssi
+@dirrm www/cgi-bin
+@dirrm www