diff --git a/Makefile b/Makefile
index df44a5e616..808608da74 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,9 @@ DEFINES+=-D_GNU_SOURCE
 ifndef CONFIG_WIN32
 TOOLS=qemu-mkcow
 endif
+ifdef CONFIG_STATIC
+LDFLAGS+=-static
+endif
 
 all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
 	for d in $(TARGET_DIRS); do \
@@ -17,7 +20,7 @@ all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
         done
 
 qemu-mkcow: qemu-mkcow.c
-	$(CC) $(CFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
 	$(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
@@ -45,6 +48,8 @@ endif
 	mkdir -p "$(sharedir)"
 	install -m 644 pc-bios/bios.bin pc-bios/vgabios.bin \
                        pc-bios/linux_boot.bin "$(sharedir)"
+	mkdir -p "$(docdir)"
+	install -m 644 qemu-doc.html  qemu-tech.html "$(docdir)"
 ifndef CONFIG_WIN32
 	mkdir -p "$(mandir)/man1"
 	install qemu.1 qemu-mkcow.1 "$(mandir)/man1"
@@ -86,9 +91,13 @@ tarbin:
         $(prefix)/bin/qemu-arm \
         $(prefix)/bin/qemu-sparc \
         $(prefix)/bin/qemu-ppc \
+        $(prefix)/bin/qemu-mkcow \
 	$(sharedir)/bios.bin \
 	$(sharedir)/vgabios.bin \
-	$(mandir)/man1/qemu.1 )
+	$(sharedir)/linux_boot.bin \
+	$(docdir)/qemu-doc.html \
+	$(docdir)/qemu-tech.html \
+	$(mandir)/man1/qemu.1 $(mandir)/man1/qemu-mkcow.1 )
 
 ifneq ($(wildcard .depend),)
 include .depend
diff --git a/configure b/configure
index 4facab5fda..843e1490fe 100755
--- a/configure
+++ b/configure
@@ -266,6 +266,7 @@ if test -z "$prefix" ; then
 fi
 mandir="$prefix"
 sharedir="$prefix"
+docdir="$prefix"
 bindir="$prefix"
 else
 if test -z "$prefix" ; then
@@ -273,6 +274,7 @@ if test -z "$prefix" ; then
 fi
 mandir="$prefix/share/man"
 sharedir="$prefix/share/qemu"
+docdir="$prefix/share/doc/qemu"
 bindir="$prefix/bin"
 fi
 
@@ -314,6 +316,7 @@ echo "prefix=$prefix" >> $config_mak
 echo "bindir=$bindir" >> $config_mak
 echo "mandir=$mandir" >> $config_mak
 echo "sharedir=$sharedir" >> $config_mak
+echo "docdir=$docdir" >> $config_mak
 echo "#define CONFIG_QEMU_SHAREDIR \"$sharedir\"" >> $config_h
 echo "MAKE=$make" >> $config_mak
 echo "CC=$cc" >> $config_mak