diff --git a/srcpkgs/thttpd/patches/getline.patch b/srcpkgs/thttpd/patches/getline.patch
new file mode 100644
index 00000000000..9be5814b2b7
--- /dev/null
+++ b/srcpkgs/thttpd/patches/getline.patch
@@ -0,0 +1,20 @@
+--- extras/htpasswd.c.orig	2013-04-23 09:29:50.553761043 +0200
++++ extras/htpasswd.c	2013-04-23 09:30:08.017849725 +0200
+@@ -49,7 +49,7 @@ static void getword(char *word, char *li
+     while((line[y++] = line[x++]));
+ }
+ 
+-static int getline(char *s, int n, FILE *f) {
++static int mygetline(char *s, int n, FILE *f) {
+     register int i=0;
+ 
+     while(1) {
+@@ -189,7 +189,7 @@ int main(int argc, char *argv[]) {
+     strcpy(user,argv[2]);
+ 
+     found = 0;
+-    while(!(getline(line,MAX_STRING_LEN,f))) {
++    while(!(mygetline(line,MAX_STRING_LEN,f))) {
+         if(found || (line[0] == '#') || (!line[0])) {
+             putline(tfp,line);
+             continue;
diff --git a/srcpkgs/thttpd/template b/srcpkgs/thttpd/template
new file mode 100644
index 00000000000..ed7cdf1abb0
--- /dev/null
+++ b/srcpkgs/thttpd/template
@@ -0,0 +1,46 @@
+# Template file for 'thttpd'
+pkgname=thttpd
+version=2.25b
+revision=1
+short_desc="Tiny/turbo/throttling HTTP server"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="BSD"
+homepage="http://www.acme.com/software/thttpd/"
+distfiles="http://www.acme.com/software/thttpd/thttpd-${version}.tar.gz"
+checksum=07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360
+
+do_configure() {
+	sed -e "s,-o bin -g bin,,g" -i Makefile.in
+
+	if [ "$CROSS_BUILD" ]; then
+		./configure --prefix=/usr --host=$XBPS_CROSS_TRIPLET
+	else
+		./configure --prefix=/usr
+	fi
+}
+
+do_build() {
+	make LD=$CC ${makejobs}
+}
+
+do_install() {
+	vmkdir usr/bin
+	vmkdir usr/share/man/man1
+	vmkdir usr/share/man/man8
+
+	make WEBGROUP=root \
+		WEBDIR=${DESTDIR}/usr/share/thttpd \
+		BINDIR=${DESTDIR}/usr/bin \
+		MANDIR=${DESTDIR}/usr/share/man install
+
+	# Rename htpasswd to not conflict with apache.
+	mv ${DESTDIR}/usr/bin/htpasswd ${DESTDIR}/usr/bin/thttpd-htpasswd
+	mv ${DESTDIR}/usr/share/man/man1/htpasswd.1 \
+		${DESTDIR}/usr/share/man/man1/thttpd-htpasswd.1
+}
+
+thttpd_package() {
+	pkg_install() {
+		vmove all
+	}
+}