diff --git a/src/add-ons/kernel/drivers/graphics/vmware/Jamfile b/src/add-ons/kernel/drivers/graphics/vmware/Jamfile
index eae023c4dd..243dbd988f 100644
--- a/src/add-ons/kernel/drivers/graphics/vmware/Jamfile
+++ b/src/add-ons/kernel/drivers/graphics/vmware/Jamfile
@@ -11,6 +11,10 @@ KernelAddon vmware :
 	device.c
 ;
 
+if $(TARGET_PLATFORM) != haiku {
+	LinkAgainst vmware : $(TARGET_HAIKU_COMPATIBILITY_LIBS) ;
+}
+
 Package haiku-vmware-video-svn :
 	vmware : 
 	boot home config add-ons kernel drivers bin ;
diff --git a/src/add-ons/kernel/drivers/graphics/vmware/device.c b/src/add-ons/kernel/drivers/graphics/vmware/device.c
index 3b7ecb4330..5e3eac6277 100644
--- a/src/add-ons/kernel/drivers/graphics/vmware/device.c
+++ b/src/add-ons/kernel/drivers/graphics/vmware/device.c
@@ -341,9 +341,13 @@ ControlHook(void *dev, uint32 msg, void *buf, size_t len)
 		
 		case VMWARE_GET_DEVICE_NAME:
 			dprintf("device: VMWARE_GET_DEVICE_NAME %s\n", gPd->names[0]);
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
 			if (user_strlcpy((char *)buf, gPd->names[0],
 					B_PATH_NAME_LENGTH) < B_OK)
 				return B_BAD_ADDRESS;
+#else
+			strlcpy((char *)buf, gPd->names[0], B_PATH_NAME_LENGTH);
+#endif
 			return B_OK;
 			
 	}