diff --git a/Makefile b/Makefile
index 8fa5c91..dfdec5c 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ SRCBOTH=misc.c stacks.c pmm.c output.c util.c block.c floppy.c ata.c mouse.c \
     pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c blockcmd.c \
     usb.c usb-uhci.c usb-ohci.c usb-ehci.c usb-hid.c usb-msc.c \
     virtio-ring.c virtio-pci.c virtio-blk.c virtio-scsi.c apm.c ahci.c \
-    usb-uas.c
+    usb-uas.c lsi-scsi.c
 SRC16=$(SRCBOTH) system.c disk.c font.c
 SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
     acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
diff --git a/src/Kconfig b/src/Kconfig
index a798d9f..3f18e0f 100644
--- a/src/Kconfig
+++ b/src/Kconfig
@@ -119,6 +119,12 @@ menu "Hardware support"
         default y
         help
             Support boot from virtio-scsi storage.
+    config LSI_SCSI
+        depends on DRIVES && !COREBOOT
+        bool "lsi53c895a scsi controllers"
+        default y
+        help
+            Support boot from lsi53c895a scsi storage.
     config FLOPPY
         depends on DRIVES
         bool "Floppy controller"
diff --git a/src/block.c b/src/block.c
index 50d7bb4..2de9c5d 100644
--- a/src/block.c
+++ b/src/block.c
@@ -280,7 +280,7 @@ map_floppy_drive(struct drive_s *drive_g)
 static int
 process_scsi_op(struct disk_op_s *op)
 {
-    if (!CONFIG_VIRTIO_SCSI && !CONFIG_USB_MSC && !CONFIG_USB_UAS)
+    if (!CONFIG_VIRTIO_SCSI && !CONFIG_USB_MSC && !CONFIG_USB_UAS && !CONFIG_LSI_SCSI)
         return 0;
     switch (op->command) {
     case CMD_READ:
@@ -323,6 +323,7 @@ process_op(struct disk_op_s *op)
     case DTYPE_USB:
     case DTYPE_UAS:
     case DTYPE_VIRTIO_SCSI:
+    case DTYPE_LSI_SCSI:
         return process_scsi_op(op);
     default:
         op->count = 0;
diff --git a/src/blockcmd.c b/src/blockcmd.c
index 2998a7c..0d0acfd 100644
--- a/src/blockcmd.c
+++ b/src/blockcmd.c
@@ -14,6 +14,7 @@
 #include "usb-msc.h" // usb_cmd_data
 #include "usb-uas.h" // usb_cmd_data
 #include "virtio-scsi.h" // virtio_scsi_cmd_data
+#include "lsi-scsi.h" // lsi_scsi_cmd_data
 #include "boot.h" // boot_add_hd
 
 // Route command to low-level handler.
@@ -32,6 +33,8 @@ cdb_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize)
         return ahci_cmd_data(op, cdbcmd, blocksize);
     case DTYPE_VIRTIO_SCSI:
         return virtio_scsi_cmd_data(op, cdbcmd, blocksize);
+    case DTYPE_LSI_SCSI:
+        return lsi_scsi_cmd_data(op, cdbcmd, blocksize);
     default:
         op->count = 0;
         return DISK_RET_EPARAM;
@@ -93,7 +96,7 @@ scsi_is_ready(struct disk_op_s *op)
 int
 scsi_init_drive(struct drive_s *drive, const char *s, int prio)
 {
-    if (!CONFIG_USB_UAS && !CONFIG_USB_MSC && !CONFIG_VIRTIO_SCSI)
+    if (!CONFIG_USB_UAS && !CONFIG_USB_MSC && !CONFIG_VIRTIO_SCSI && !CONFIG_LSI_SCSI)
         return 0;
 
     struct disk_op_s dop;
diff --git a/src/disk.h b/src/disk.h
index 787b5b4..6810cd7 100644
--- a/src/disk.h
+++ b/src/disk.h
@@ -232,6 +232,7 @@ struct drive_s {
 #define DTYPE_VIRTIO_BLK   0x08
 #define DTYPE_USB          0x09
 #define DTYPE_UAS          0x0a
+#define DTYPE_LSI_SCSI     0x0b
 
 #define MAXDESCSIZE 80
 
diff --git a/src/lsi-scsi.c b/src/lsi-scsi.c
new file mode 100644
index 0000000..37acd28
--- /dev/null
+++ b/src/lsi-scsi.c
@@ -0,0 +1,213 @@
+// (qemu-emulated) lsi53c895a boot support.
+//
+// Copyright (C) 2012 Red Hat Inc.
+//
+// Authors:
+//  Gerd Hoffmann <kraxel@redhat.com>
+//
+// based on virtio-scsi.c which is written by:
+//  Paolo Bonzini <pbonzini@redhat.com>
+//
+// This file may be distributed under the terms of the GNU LGPLv3 license.
+
+#include "util.h" // dprintf
+#include "pci.h" // foreachpci
+#include "config.h" // CONFIG_*
+#include "biosvar.h" // GET_GLOBAL
+#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
+#include "pci_regs.h" // PCI_VENDOR_ID
+#include "boot.h" // bootprio_find_scsi_device
+#include "blockcmd.h" // scsi_init_drive
+#include "disk.h"
+
+#define LSI_REG_DSTAT     0x0c
+#define LSI_REG_ISTAT0    0x14
+#define LSI_REG_DSP0      0x2c
+#define LSI_REG_DSP1      0x2d
+#define LSI_REG_DSP2      0x2e
+#define LSI_REG_DSP3      0x2f
+#define LSI_REG_SIST0     0x42
+#define LSI_REG_SIST1     0x43
+
+#define LSI_ISTAT0_DIP    0x01
+#define LSI_ISTAT0_SIP    0x02
+#define LSI_ISTAT0_INTF   0x04
+#define LSI_ISTAT0_CON    0x08
+#define LSI_ISTAT0_SEM    0x10
+#define LSI_ISTAT0_SIGP   0x20
+#define LSI_ISTAT0_SRST   0x40
+#define LSI_ISTAT0_ABRT   0x80
+
+struct lsi_lun_s {
+    struct drive_s drive;
+    struct pci_device *pci;
+    u32 iobase;
+    u8 target;
+    u8 lun;
+};
+
+static int
+lsi_scsi_cmd(struct lsi_lun_s *llun, struct disk_op_s *op,
+             void *cdbcmd, u16 target, u16 lun, u16 blocksize)
+{
+    u32 iobase = GET_GLOBAL(llun->iobase);
+    u32 dma = ((cdb_is_read(cdbcmd, blocksize) ? 0x01000000 : 0x00000000) |
+               (op->count * blocksize));
+    u8 msgout[] = {
+        0x80 | lun,                 // select lun
+        0x08,
+    };
+    u8 status = 0xff;
+    u8 msgin_tmp[2];
+    u8 msgin = 0xff;
+
+    /* FIXME: probably not the best idea to have this on the stack ... */
+    u32 script[] = {
+        /* select target, send scsi command */
+        0x40000000 | target << 16,  // select target
+        0x00000000,
+        0x06000001,                 // msgout
+        (u32)MAKE_FLATPTR(GET_SEG(SS), &msgout),
+        0x02000010,                 // scsi command
+        (u32)MAKE_FLATPTR(GET_SEG(SS), cdbcmd),
+
+        /* handle disconnect */
+        0x87820000,                 // phase == msgin ?
+        0x00000018,
+        0x07000002,                 // msgin
+        (u32)MAKE_FLATPTR(GET_SEG(SS), &msgin_tmp),
+        0x50000000,                 // re-select
+        0x00000000,
+        0x07000002,                 // msgin
+        (u32)MAKE_FLATPTR(GET_SEG(SS), &msgin_tmp),
+
+        /* dma data, get status, raise irq */
+        dma,                        // dma data
+        (u32)op->buf_fl,
+        0x03000001,                 // status
+        (u32)MAKE_FLATPTR(GET_SEG(SS), &status),
+        0x07000001,                 // msgin
+        (u32)MAKE_FLATPTR(GET_SEG(SS), &msgin),
+        0x98080000,                 // dma irq
+        0x00000000,
+    };
+    u32 dsp = (u32)MAKE_FLATPTR(GET_SEG(SS), &script);
+
+    outb(dsp         & 0xff, iobase + LSI_REG_DSP0);
+    outb((dsp >>  8) & 0xff, iobase + LSI_REG_DSP1);
+    outb((dsp >> 16) & 0xff, iobase + LSI_REG_DSP2);
+    outb((dsp >> 24) & 0xff, iobase + LSI_REG_DSP3);
+
+    for (;;) {
+        u8 dstat = inb(iobase + LSI_REG_DSTAT);
+        u8 sist0 = inb(iobase + LSI_REG_SIST0);
+        u8 sist1 = inb(iobase + LSI_REG_SIST1);
+        if (sist0 || sist1) {
+            goto fail;
+        }
+        if (dstat & 0x04) {
+            break;
+        }
+        usleep(5);
+    }
+
+    if (msgin == 0 && status == 0) {
+        return DISK_RET_SUCCESS;
+    }
+
+fail:
+    // sledge hammer to get back into a known-good state: hba reset
+    outb(LSI_ISTAT0_SRST, iobase + LSI_REG_ISTAT0);
+    return DISK_RET_EBADTRACK;
+}
+
+int
+lsi_scsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize)
+{
+    if (!CONFIG_LSI_SCSI)
+        return DISK_RET_EBADTRACK;
+
+    struct lsi_lun_s *llun =
+        container_of(op->drive_g, struct lsi_lun_s, drive);
+
+    return lsi_scsi_cmd(llun, op, cdbcmd,
+                        GET_GLOBAL(llun->target), GET_GLOBAL(llun->lun),
+                        blocksize);
+}
+
+static int
+lsi_scsi_add_lun(struct pci_device *pci, u32 iobase, u8 target, u8 lun)
+{
+    struct lsi_lun_s *llun = malloc_fseg(sizeof(*llun));
+    if (!llun) {
+        warn_noalloc();
+        return -1;
+    }
+    memset(llun, 0, sizeof(*llun));
+    llun->drive.type = DTYPE_LSI_SCSI;
+    llun->drive.cntl_id = pci->bdf;
+    llun->pci = pci;
+    llun->target = target;
+    llun->lun = lun;
+    llun->iobase = iobase;
+
+    char *name = znprintf(16, "lsi %02x:%02x.%x %d:%d",
+                          pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf),
+                          pci_bdf_to_fn(pci->bdf), target, lun);
+    int prio = bootprio_find_scsi_device(pci, target, lun);
+    int ret = scsi_init_drive(&llun->drive, name, prio);
+    free(name);
+    if (ret)
+        goto fail;
+    return 0;
+
+fail:
+    free(llun);
+    return -1;
+}
+
+static void
+lsi_scsi_scan_target(struct pci_device *pci, u32 iobase, u8 target)
+{
+    /* TODO: send REPORT LUNS.  For now, only LUN 0 is recognized.  */
+    lsi_scsi_add_lun(pci, iobase, target, 0);
+}
+
+static void
+init_lsi_scsi(struct pci_device *pci)
+{
+    u16 bdf = pci->bdf;
+    u32 iobase = pci_config_readl(pci->bdf, PCI_BASE_ADDRESS_0)
+        & PCI_BASE_ADDRESS_IO_MASK;
+
+    dprintf(1, "found lsi53c895a at %02x:%02x.%x, io @ %x\n",
+            pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf),
+            pci_bdf_to_fn(bdf), iobase);
+
+    // reset
+    outb(LSI_ISTAT0_SRST, iobase + LSI_REG_ISTAT0);
+
+    int i;
+    for (i = 0; i < 7; i++)
+        lsi_scsi_scan_target(pci, iobase, i);
+
+    return;
+}
+
+void
+lsi_scsi_setup(void)
+{
+    ASSERT32FLAT();
+    if (!CONFIG_LSI_SCSI)
+        return;
+
+    dprintf(3, "init lsi53c895a\n");
+
+    struct pci_device *pci;
+    foreachpci(pci) {
+        if (pci->vendor != PCI_VENDOR_ID_LSI_LOGIC
+            || pci->device != PCI_DEVICE_ID_LSI_53C895A)
+            continue;
+        init_lsi_scsi(pci);
+    }
+}
diff --git a/src/lsi-scsi.h b/src/lsi-scsi.h
new file mode 100644
index 0000000..f593f99
--- /dev/null
+++ b/src/lsi-scsi.h
@@ -0,0 +1,2 @@
+void lsi_scsi_setup(void);
+int lsi_scsi_cmd_data(struct disk_op_s *op, void *cdbcmd, u16 blocksize);
diff --git a/src/post.c b/src/post.c
index 3101505..0f31b4c 100644
--- a/src/post.c
+++ b/src/post.c
@@ -27,6 +27,7 @@
 #include "ps2port.h" // ps2port_setup
 #include "virtio-blk.h" // virtio_blk_setup
 #include "virtio-scsi.h" // virtio_scsi_setup
+#include "lsi-scsi.h" // lsi_scsi_setup
 
 
 /****************************************************************
@@ -194,6 +195,7 @@ init_hw(void)
     ramdisk_setup();
     virtio_blk_setup();
     virtio_scsi_setup();
+    lsi_scsi_setup();
 }
 
 // Begin the boot process by invoking an int0x19 in 16bit mode.