diff --git a/Makefile b/Makefile
index e27d1fe3b47490f8243c49d33aa4c14582450936..b9d8e690c769533fde9cb25c85e383ed3fbf00c3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 include config-host.mak
 
-CFLAGS=-Wall -O2 -g
+CFLAGS=-Wall -O2 -g -fno-strict-aliasing
 ifdef CONFIG_DARWIN
 CFLAGS+= -mdynamic-no-pic
 endif
@@ -10,9 +10,7 @@ endif
 LDFLAGS=-g
 LIBS=
 DEFINES+=-D_GNU_SOURCE
-ifndef CONFIG_WIN32
-TOOLS=qemu-mkcow vmdk2raw
-endif
+TOOLS=qemu-img
 ifdef CONFIG_STATIC
 LDFLAGS+=-static
 endif
@@ -22,11 +20,8 @@ all: dyngen$(EXESUF) $(TOOLS) qemu-doc.html qemu-tech.html qemu.1
 	$(MAKE) -C $$d $@ || exit 1 ; \
         done
 
-qemu-mkcow: qemu-mkcow.c
-	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
-
-vmdk2raw: vmdk2raw.c
-	$(CC) $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ $(LIBS)
+qemu-img: qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c
+	$(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
 
 dyngen$(EXESUF): dyngen.c
 	$(HOST_CC) $(CFLAGS) $(DEFINES) -o $@ $^
@@ -99,7 +94,7 @@ tarbin:
         $(bindir)/qemu-arm \
         $(bindir)/qemu-sparc \
         $(bindir)/qemu-ppc \
-        $(bindir)/qemu-mkcow $(bindir)/vmdk2raw \
+        $(bindir)/qemu-img \
 	$(datadir)/bios.bin \
 	$(datadir)/vgabios.bin \
 	$(datadir)/vgabios-cirrus.bin \
diff --git a/Makefile.target b/Makefile.target
index d565e1dd9a01d075c8590599652b876d606c57c7..9c9cfcfead2fa29565a688f02cc7c5c63a4ce110 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -161,6 +161,9 @@ endif
 
 DEFINES+=-D_GNU_SOURCE
 LIBS+=-lm
+ifndef CONFIG_USER_ONLY
+LIBS+=-lz
+endif
 ifdef CONFIG_WIN32
 LIBS+=-lwinmm -lws2_32 -liphlpapi
 endif
@@ -237,7 +240,8 @@ ifeq ($(ARCH),alpha)
 endif
 
 # must use static linking to avoid leaving stuff in virtual address space
-VL_OBJS=vl.o osdep.o block.o monitor.o pci.o console.o
+VL_OBJS=vl.o osdep.o block.o readline.o monitor.o pci.o console.o 
+VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o
 
 ifeq ($(TARGET_ARCH), i386)
 # Hardware support