--- Makefile.in.orig	2007-12-09 18:11:00.000000000 +0100
+++ Makefile.in	2007-12-13 20:54:54.000000000 +0100
@@ -13,8 +13,8 @@
 
 WD_VERSION		= @WD_VERSION@
 WD_MAINTAINER	= @WD_MAINTAINER@
-WD_USER			= @WD_USER@
-WD_GROUP		= @WD_GROUP@
+WD_USER			= wired
+WD_GROUP		= wired
 
 DISTFILES		= INSTALL LICENSE NEWS README Makefile Makefile.in \
 				  config.guess config.status config.h.in config.sub configure \
@@ -71,7 +71,7 @@
 
 $(rundir)/wiredctl: $(abs_top_srcdir)/wired/wiredctl.in
 	@test -d $(@D) || mkdir -p $(@D)
-	sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' $< > $@
+	sed -e 's,@wireddir\@,$(fake_prefix)/$(wireddir),g' -e 's,@prefix\@,$(prefix),g' $< > $@
 	chmod +x $@
 
 $(rundir)/etc/wired.conf: $(abs_top_srcdir)/wired/wired.conf.in
@@ -91,10 +91,6 @@
 install-only: install-man install-wired
 
 install-wired:
-	@if [ -e $(installdir)/wired ]; then \
-		touch .update; \
-	fi
-
 	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/
 	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/etc/
 	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) -d $(installdir)/tmp/
@@ -109,55 +105,16 @@
 		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/files/Drop\ Box/.wired/type $(installdir)/files/Drop\ Box/.wired/; \
 	fi
 
-	if [ ! -f $(installdir)/banlist ]; then \
-		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/banlist $(installdir)/; \
-	fi
-
-	if [ ! -f $(installdir)/groups ]; then \
-		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/groups $(installdir)/; \
-	fi
-
-	if [ ! -f $(installdir)/news ]; then \
-		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/news $(installdir)/; \
-	fi
-
-	if [ ! -f $(installdir)/users ]; then \
-		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/users $(installdir)/; \
-	fi
-
-	if [ ! -f $(installdir)/etc/wired.conf ]; then \
-		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/etc/wired.conf $(installdir)/etc/; \
-	fi
-
-	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/wired $(installdir)/
-	$(INSTALL) -m 755 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/wiredctl $(installdir)/
-
-	if [ -f /etc/resolv.conf ]; then \
-		$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) /etc/resolv.conf $(installdir)/etc/; \
-	fi
-
-	@if [ -f .update ]; then \
-		echo ""; \
-		echo "Update complete!"; \
-		echo ""; \
-		echo "You should now run:"; \
-		echo "    $(installdir)/wiredctl restart"; \
-		echo "to restart a running server."; \
-	else \
-		echo ""; \
-		echo "Installation complete!"; \
-		echo ""; \
-		echo "An administrator account with login \"admin\" and no password has been created."; \
-		echo ""; \
-		echo "Remember to edit $(installdir)/etc/wired.conf if you want to make any changes before starting the server."; \
-		echo ""; \
-		echo "When you are done, run:"; \
-		echo "    $(installdir)/wiredctl start"; \
-		echo "to start the server."; \
-	fi
-
-	@rm -f .update
-
+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/banlist $(installdir)/banlist.sample
+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/groups $(installdir)/groups.sample
+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/news $(installdir)/news.sample
+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/users $(installdir)/users.sample
+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) $(rundir)/etc/wired.conf $(installdir)/etc/wired.conf.sample
+	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/wired $(prefix)/sbin/
+	$(INSTALL) -m 755 -o 0 -g 0 $(rundir)/wiredctl $(prefix)/bin/
+
+	$(INSTALL) -m 644 -o $(WD_USER) -g $(WD_GROUP) /etc/resolv.conf $(installdir)/etc/resolv.conf.sample
+
 install-man:
 	$(INSTALL) -m 755 -d $(mandir)/man1/
 	$(INSTALL) -m 644 $(abs_top_srcdir)/man/wiredctl.1 $(mandir)/man1/