diff --git a/reactos/drivers/storage/scsiport-new/.cvsignore b/reactos/drivers/storage/scsiport-new/.cvsignore
deleted file mode 100644
index f95558eac75..00000000000
--- a/reactos/drivers/storage/scsiport-new/.cvsignore
+++ /dev/null
@@ -1,8 +0,0 @@
-base.tmp
-junk.tmp
-temp.exp
-scsiport.coff
-*.o
-*.sym
-*.sys
-*.map
diff --git a/reactos/drivers/storage/scsiport-new/makefile b/reactos/drivers/storage/scsiport-new/makefile
deleted file mode 100644
index ef51fa06089..00000000000
--- a/reactos/drivers/storage/scsiport-new/makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# $Id: makefile,v 1.6 2003/11/13 14:20:03 ekohl Exp $
-
-PATH_TO_TOP = ../../..
-
-TARGET_BOOTSTRAP = yes
-
-TARGET_TYPE = export_driver
-
-TARGET_NAME = scsiport
-
-TARGET_OBJECTS = $(TARGET_NAME).o
-
-TARGET_CFLAGS = -Werror -Wall
-
-include $(PATH_TO_TOP)/rules.mak
-
-include $(TOOLS_PATH)/helper.mk
diff --git a/reactos/drivers/storage/scsiport-new/scsiport.def b/reactos/drivers/storage/scsiport-new/scsiport.def
index 47708a883d0..0ffd933c7f8 100644
--- a/reactos/drivers/storage/scsiport-new/scsiport.def
+++ b/reactos/drivers/storage/scsiport-new/scsiport.def
@@ -1,4 +1,4 @@
-; $Id: scsiport.def,v 1.2 2001/07/23 06:13:48 ekohl Exp $
+; $Id$
;
; scsiport.def - export definition file for scsiport driver
;
@@ -7,7 +7,7 @@ EXPORTS
ScsiDebugPrint
ScsiPortCompleteRequest@20
ScsiPortConvertPhysicalAddressToUlong@8
-ScsiPortConvertUlongToPhysicalAddress@4
+ScsiPortConvertUlongToPhysicalAddress@4=NTOSKRNL.RtlConvertUlongToLargeInteger
ScsiPortFlushDma@4
ScsiPortFreeDeviceBase@8
ScsiPortGetBusData@24
@@ -22,31 +22,31 @@ ScsiPortIoMapTransfer@16
ScsiPortLogError@28
ScsiPortMoveMemory@12
ScsiPortNotification
-ScsiPortReadPortBufferUchar@12
-ScsiPortReadPortBufferUshort@12
-ScsiPortReadPortBufferUlong@12
-ScsiPortReadPortUchar@4
-ScsiPortReadPortUshort@4
-ScsiPortReadPortUlong@4
-ScsiPortReadRegisterBufferUchar@12
-ScsiPortReadRegisterBufferUshort@12
-ScsiPortReadRegisterBufferUlong@12
-ScsiPortReadRegisterUchar@4
-ScsiPortReadRegisterUshort@4
-ScsiPortReadRegisterUlong@4
+ScsiPortReadPortBufferUchar@12=HAL.READ_PORT_BUFFER_UCHAR
+ScsiPortReadPortBufferUshort@12=HAL.READ_PORT_BUFFER_USHORT
+ScsiPortReadPortBufferUlong@12=HAL.READ_PORT_BUFFER_ULONG
+ScsiPortReadPortUchar@4=HAL.READ_PORT_UCHAR
+ScsiPortReadPortUshort@4=HAL.READ_PORT_USHORT
+ScsiPortReadPortUlong@4=HAL.READ_PORT_ULONG
+ScsiPortReadRegisterBufferUchar@12=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
+ScsiPortReadRegisterBufferUshort@12=NTOSKRNL.READ_REGISTER_BUFFER_USHORT
+ScsiPortReadRegisterBufferUlong@12=NTOSKRNL.READ_REGISTER_BUFFER_ULONG
+ScsiPortReadRegisterUchar@4=NTOSKRNL.READ_REGISTER_UCHAR
+ScsiPortReadRegisterUshort@4=NTOSKRNL.READ_REGISTER_USHORT
+ScsiPortReadRegisterUlong@4=NTOSKRNL.READ_REGISTER_ULONG
ScsiPortSetBusDataByOffset@28
-ScsiPortStallExecution@4
+ScsiPortStallExecution@4=HAL.KeStallExecutionProcessor
ScsiPortValidateRange@28
-ScsiPortWritePortBufferUchar@12
-ScsiPortWritePortBufferUshort@12
-ScsiPortWritePortBufferUlong@12
-ScsiPortWritePortUchar@8
-ScsiPortWritePortUshort@8
-ScsiPortWritePortUlong@8
-ScsiPortWriteRegisterBufferUchar@12
-ScsiPortWriteRegisterBufferUshort@12
-ScsiPortWriteRegisterBufferUlong@12
-ScsiPortWriteRegisterUchar@8
-ScsiPortWriteRegisterUshort@8
-ScsiPortWriteRegisterUlong@8
+ScsiPortWritePortUchar@8=HAL.WRITE_PORT_UCHAR
+ScsiPortWritePortUshort@8=HAL.WRITE_PORT_USHORT
+ScsiPortWritePortUlong@8=HAL.WRITE_PORT_ULONG
+ScsiPortWritePortBufferUchar@12=HAL.WRITE_PORT_BUFFER_UCHAR
+ScsiPortWritePortBufferUshort@12=HAL.WRITE_PORT_BUFFER_USHORT
+ScsiPortWritePortBufferUlong@12=HAL.WRITE_PORT_BUFFER_ULONG
+ScsiPortWriteRegisterBufferUchar@12=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
+ScsiPortWriteRegisterBufferUshort@12=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
+ScsiPortWriteRegisterBufferUlong@12=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
+ScsiPortWriteRegisterUchar@8=NTOSKRNL.WRITE_REGISTER_UCHAR
+ScsiPortWriteRegisterUshort@8=NTOSKRNL.WRITE_REGISTER_USHORT
+ScsiPortWriteRegisterUlong@8=NTOSKRNL.WRITE_REGISTER_ULONG
;EOF
diff --git a/reactos/drivers/storage/scsiport-new/scsiport.edf b/reactos/drivers/storage/scsiport-new/scsiport.edf
deleted file mode 100644
index 8c2545b42fa..00000000000
--- a/reactos/drivers/storage/scsiport-new/scsiport.edf
+++ /dev/null
@@ -1,52 +0,0 @@
-; $Id: scsiport.edf,v 1.5 2002/06/26 18:39:50 hbirr Exp $
-;
-; scsiport.def - export definition file for scsiport driver
-;
-LIBRARY SCSIPORT.SYS
-EXPORTS
-ScsiDebugPrint
-ScsiPortCompleteRequest=ScsiPortCompleteRequest@20
-ScsiPortConvertPhysicalAddressToUlong=ScsiPortConvertPhysicalAddressToUlong@8
-ScsiPortConvertUlongToPhysicalAddress=NTOSKRNL.RtlConvertUlongToLargeInteger
-ScsiPortFlushDma=ScsiPortFlushDma@4
-ScsiPortFreeDeviceBase=ScsiPortFreeDeviceBase@8
-ScsiPortGetBusData=ScsiPortGetBusData@24
-ScsiPortGetDeviceBase=ScsiPortGetDeviceBase@28
-ScsiPortGetLogicalUnit=ScsiPortGetLogicalUnit@16
-ScsiPortGetPhysicalAddress=ScsiPortGetPhysicalAddress@16
-ScsiPortGetSrb=ScsiPortGetSrb@20
-ScsiPortGetUncachedExtension=ScsiPortGetUncachedExtension@12
-ScsiPortGetVirtualAddress=ScsiPortGetVirtualAddress@12
-ScsiPortInitialize=ScsiPortInitialize@16
-ScsiPortIoMapTransfer=ScsiPortIoMapTransfer@16
-ScsiPortLogError=ScsiPortLogError@28
-ScsiPortMoveMemory=ScsiPortMoveMemory@12
-ScsiPortNotification
-ScsiPortReadPortBufferUchar=HAL.READ_PORT_BUFFER_UCHAR
-ScsiPortReadPortBufferUshort=HAL.READ_PORT_BUFFER_USHORT
-ScsiPortReadPortBufferUlong=HAL.READ_PORT_BUFFER_ULONG
-ScsiPortReadPortUchar=HAL.READ_PORT_UCHAR
-ScsiPortReadPortUshort=HAL.READ_PORT_USHORT
-ScsiPortReadPortUlong=HAL.READ_PORT_ULONG
-ScsiPortReadRegisterBufferUchar=NTOSKRNL.READ_REGISTER_BUFFER_UCHAR
-ScsiPortReadRegisterBufferUshort=NTOSKRNL.READ_REGISTER_BUFFER_USHORT
-ScsiPortReadRegisterBufferUlong=NTOSKRNL.READ_REGISTER_BUFFER_ULONG
-ScsiPortReadRegisterUchar=NTOSKRNL.READ_REGISTER_UCHAR
-ScsiPortReadRegisterUshort=NTOSKRNL.READ_REGISTER_USHORT
-ScsiPortReadRegisterUlong=NTOSKRNL.READ_REGISTER_ULONG
-ScsiPortSetBusDataByOffset=ScsiPortSetBusDataByOffset@28
-ScsiPortStallExecution=HAL.KeStallExecutionProcessor
-ScsiPortValidateRange=ScsiPortValidateRange@28
-ScsiPortWritePortUchar=HAL.WRITE_PORT_UCHAR
-ScsiPortWritePortUshort=HAL.WRITE_PORT_USHORT
-ScsiPortWritePortUlong=HAL.WRITE_PORT_ULONG
-ScsiPortWritePortBufferUchar=HAL.WRITE_PORT_BUFFER_UCHAR
-ScsiPortWritePortBufferUshort=HAL.WRITE_PORT_BUFFER_USHORT
-ScsiPortWritePortBufferUlong=HAL.WRITE_PORT_BUFFER_ULONG
-ScsiPortWriteRegisterBufferUchar=NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR
-ScsiPortWriteRegisterBufferUshort=NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT
-ScsiPortWriteRegisterBufferUlong=NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG
-ScsiPortWriteRegisterUchar=NTOSKRNL.WRITE_REGISTER_UCHAR
-ScsiPortWriteRegisterUshort=NTOSKRNL.WRITE_REGISTER_USHORT
-ScsiPortWriteRegisterUlong=NTOSKRNL.WRITE_REGISTER_ULONG
-;EOF
diff --git a/reactos/drivers/storage/scsiport-new/scsiport.rbuild b/reactos/drivers/storage/scsiport-new/scsiport.rbuild
new file mode 100644
index 00000000000..1b5b1f5359d
--- /dev/null
+++ b/reactos/drivers/storage/scsiport-new/scsiport.rbuild
@@ -0,0 +1,11 @@
+
+
+
+
+
+ .
+ ntoskrnl
+ hal
+ scsiport.c
+ scsiport.rc
+
diff --git a/reactos/drivers/storage/scsiport-new/scsiport.rc b/reactos/drivers/storage/scsiport-new/scsiport.rc
index a4939b8b06e..7d532f37bd9 100644
--- a/reactos/drivers/storage/scsiport-new/scsiport.rc
+++ b/reactos/drivers/storage/scsiport-new/scsiport.rc
@@ -1,37 +1,7 @@
-#include
-#include
+/* $Id$ */
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION RES_UINT_FV_MAJOR,RES_UINT_FV_MINOR,RES_UINT_FV_REVISION,RES_UINT_FV_BUILD
- PRODUCTVERSION RES_UINT_PV_MAJOR,RES_UINT_PV_MINOR,RES_UINT_PV_REVISION,RES_UINT_PV_BUILD
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x40004L
- FILETYPE 0x2L
- FILESUBTYPE 0x0L
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "040904b0"
- BEGIN
- VALUE "CompanyName", RES_STR_COMPANY_NAME
- VALUE "FileDescription", "SCSI Port Driver\0"
- VALUE "FileVersion", "0.0.0\0"
- VALUE "InternalName", "scsiport\0"
- VALUE "LegalCopyright", RES_STR_LEGAL_COPYRIGHT
- VALUE "OriginalFilename", "scsiport.sys\0"
- VALUE "ProductName", RES_STR_PRODUCT_NAME
- VALUE "ProductVersion", RES_STR_PRODUCT_VERSION
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0x409, 1200
- END
-END
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION "SCSI Port Driver\0"
+#define REACTOS_STR_INTERNAL_NAME "scsiport\0"
+#define REACTOS_STR_ORIGINAL_FILENAME "scsiport.sys\0"
+#include