diff -Naur thttpd-2.25b.orig/cgi-src/Makefile.in thttpd-2.25b/cgi-src/Makefile.in
--- thttpd-2.25b.orig/cgi-src/Makefile.in	2008-04-10 17:08:20.000000000 -0400
+++ thttpd-2.25b/cgi-src/Makefile.in	2008-04-10 17:08:28.000000000 -0400
@@ -67,17 +67,17 @@
 	cd .. ; $(MAKE) $(MFLAGS) strerror.o
 
 install:	all
-	-mkdir -p $(CGIBINDIR)
-	rm -f $(CGIBINDIR)/redirect
-	cp redirect $(CGIBINDIR)/redirect
-	rm -f $(MANDIR)/man8/redirect.8
-	cp redirect.8 $(MANDIR)/man8/redirect.8
-	rm -f $(CGIBINDIR)/ssi
-	cp ssi $(CGIBINDIR)/ssi
-	rm -f $(MANDIR)/man8/ssi.8
-	cp ssi.8 $(MANDIR)/man8/ssi.8
-	rm -f $(CGIBINDIR)/phf
-	cp phf $(CGIBINDIR)/phf
+	-mkdir -p $(DESTDIR)$(CGIBINDIR)
+	rm -f $(DESTDIR)$(CGIBINDIR)/redirect
+	cp redirect $(DESTDIR)$(CGIBINDIR)/redirect
+	rm -f $(DESTDIR)$(MANDIR)/man8/redirect.8
+	cp redirect.8 $(DESTDIR)$(MANDIR)/man8/redirect.8
+	rm -f $(DESTDIR)$(CGIBINDIR)/ssi
+	cp ssi $(DESTDIR)$(CGIBINDIR)/ssi
+	rm -f $(DESTDIR)$(MANDIR)/man8/ssi.8
+	cp ssi.8 $(DESTDIR)$(MANDIR)/man8/ssi.8
+	rm -f $(DESTDIR)$(CGIBINDIR)/phf
+	cp phf $(DESTDIR)$(CGIBINDIR)/phf
 
 clean:
 	rm -f $(CLEANFILES)
diff -Naur thttpd-2.25b.orig/extras/Makefile.in thttpd-2.25b/extras/Makefile.in
--- thttpd-2.25b.orig/extras/Makefile.in	2008-04-10 17:08:20.000000000 -0400
+++ thttpd-2.25b/extras/Makefile.in	2008-04-10 17:08:28.000000000 -0400
@@ -66,18 +66,19 @@
 
 
 install:	all
-	rm -f $(BINDIR)/makeweb $(BINDIR)/htpasswd $(BINDIR)/syslogtocern
-	cp makeweb $(BINDIR)/makeweb
-	chgrp $(WEBGROUP) $(BINDIR)/makeweb
-	chmod 2755 $(BINDIR)/makeweb
-	cp htpasswd $(BINDIR)/htpasswd
-	cp syslogtocern $(BINDIR)/syslogtocern
-	rm -f $(MANDIR)/man1/makeweb.1
-	cp makeweb.1 $(MANDIR)/man1/makeweb.1
-	rm -f $(MANDIR)/man1/htpasswd.1
-	cp htpasswd.1 $(MANDIR)/man1/htpasswd.1
-	rm -f $(MANDIR)/man8/syslogtocern.8
-	cp syslogtocern.8 $(MANDIR)/man8/syslogtocern.8
+	mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man{1,8}
+	rm -f $(DESTDIR)$(BINDIR)/makeweb $(DESTDIR)$(BINDIR)/htpasswd $(DESTDIR)$(BINDIR)/syslogtocern
+	cp makeweb $(DESTDIR)$(BINDIR)/makeweb
+	chgrp $(WEBGROUP) $(DESTDIR)$(BINDIR)/makeweb
+	chmod 2755 $(DESTDIR)$(BINDIR)/makeweb
+	cp htpasswd $(DESTDIR)$(BINDIR)/htpasswd
+	cp syslogtocern $(DESTDIR)$(BINDIR)/syslogtocern
+	rm -f $(DESTDIR)$(MANDIR)/man1/makeweb.1
+	cp makeweb.1 $(DESTDIR)$(MANDIR)/man1/makeweb.1
+	rm -f $(DESTDIR)$(MANDIR)/man1/htpasswd.1
+	cp htpasswd.1 $(DESTDIR)$(MANDIR)/man1/htpasswd.1
+	rm -f $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
+	cp syslogtocern.8 $(DESTDIR)$(MANDIR)/man8/syslogtocern.8
 
 clean:
 	rm -f $(CLEANFILES)
diff -Naur thttpd-2.25b.orig/Makefile.in thttpd-2.25b/Makefile.in
--- thttpd-2.25b.orig/Makefile.in	2008-04-10 17:08:20.000000000 -0400
+++ thttpd-2.25b/Makefile.in	2008-04-10 17:09:13.000000000 -0400
@@ -39,7 +39,7 @@
 # CONFIGURE: The group that the web directory belongs to.  This is so that
 # the makeweb program can be installed set-group-id to that group, and make
 # subdirectories.  If you're not going to use makeweb, ignore this.
-WEBGROUP =	www
+WEBGROUP =	root
 
 # CONFIGURE: Directory for CGI executables.
 CGIBINDIR =	$(WEBDIR)/cgi-bin
@@ -110,11 +110,11 @@
 
 installthis:
 	-mkdir -p $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 555 -o bin -g bin thttpd $(DESTDIR)$(BINDIR)
+	$(INSTALL) -m 555 -o root -g root thttpd $(DESTDIR)$(BINDIR)
 
 install-man:
 	-mkdir -p $(DESTDIR)$(MANDIR)/man8
-	$(INSTALL) -m 444 -o bin -g bin thttpd.8 $(DESTDIR)$(MANDIR)/man8
+	$(INSTALL) -m 444 -o root -g root thttpd.8 $(DESTDIR)$(MANDIR)/man8
 
 installsubdirs:
 	for i in $(SUBDIRS) ; do ( \
