diff --git a/Makefile.target b/Makefile.target
index 3d49d97303..5158c89366 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -614,6 +614,7 @@ OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds122
 OBJS+= piix_pci.o parallel.o cirrus_vga.o pcspk.o $(SOUND_HW)
 OBJS+= mipsnet.o
 OBJS+= pflash_cfi01.o
+OBJS+= vmware_vga.o
 CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE
 endif
 ifeq ($(TARGET_BASE_ARCH), cris)
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index b7afb2d9a5..af1abb85ad 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -941,8 +941,16 @@ void mips_malta_init (ram_addr_t ram_size, int vga_ram_size,
     network_init(pci_bus);
 
     /* Optional PCI video card */
-    pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size,
+    if (cirrus_vga_enabled) {
+        pci_cirrus_vga_init(pci_bus, phys_ram_base + ram_size,
+                            ram_size, vga_ram_size);
+    } else if (vmsvga_enabled) {
+        pci_vmsvga_init(pci_bus, phys_ram_base + ram_size,
                         ram_size, vga_ram_size);
+    } else if (std_vga_enabled) {
+        pci_vga_init(pci_bus, phys_ram_base + ram_size,
+                     ram_size, vga_ram_size, 0, 0);
+    }
 }
 
 QEMUMachine mips_malta_machine = {
diff --git a/qemu-doc.texi b/qemu-doc.texi
index b2fa19e750..7905b5606b 100644
--- a/qemu-doc.texi
+++ b/qemu-doc.texi
@@ -2700,7 +2700,7 @@ PCnet32 PCI network card
 @item
 Malta FPGA serial device
 @item
-Cirrus VGA graphics card
+Cirrus (default) or any other PCI VGA graphics card
 @end itemize
 
 The ACER Pica emulation supports: