diff --git a/Jamfile-engine b/Jamfile-engine
index a3a5362..0ec8137 100644
--- a/Jamfile-engine
+++ b/Jamfile-engine
@@ -26,7 +26,7 @@ rule AddResources
 
 actions AddResources
 {
-	$(XRES) -o "$(<)" $(>)
+	$(XRES) -o "$(<)" "$(>)"
 }
 
 # Rc <Resource File> : <Resource definition file> ;
@@ -349,7 +349,7 @@ if ( $(OSPLAT) = X86 )
 	switch $(TYPE)
 	{
 		case APP : LINKFLAGS += -Xlinker -soname=_APP_ ;
-		case SHARED : LINKFLAGS += -shared -Xlinker -soname=$(NAME) ;
+		case SHARED : LINKFLAGS += -shared -Xlinker -soname=\"$(NAME)\" ;
 		case DRIVER : LINKFLAGS += -nostdlib /boot/develop/lib/x86/_KERNEL_ ;
 	}
 }