diff --git a/boost/prj/d.lst b/boost/prj/d.lst
index 03a7292..d5325b2 100644
--- a/boost/prj/d.lst
+++ b/boost/prj/d.lst
@@ -1205,3 +1205,5 @@ mkdir: %_DEST%\inc\boost\xpressive\traits\detail
 ..\%__SRC%\inc\boost\xpressive\detail\utility\* %_DEST%\inc\boost\xpressive\detail\utility
 ..\%__SRC%\inc\boost\xpressive\traits\* %_DEST%\inc\boost\xpressive\traits
 ..\%__SRC%\inc\boost\xpressive\traits\detail\* %_DEST%\inc\boost\xpressive\traits\detail
+..\%__SRC%\lib\*.a %_DEST%\lib\*.a
+..\%__SRC%\slb\*.lib %_DEST%\lib\*.lib
diff --git a/ucb/source/ucp/cmis/makefile.mk b/ucb/source/ucp/cmis/makefile.mk
index 4f43c29..a3a2782 100644
--- a/ucb/source/ucp/cmis/makefile.mk
+++ b/ucb/source/ucp/cmis/makefile.mk
@@ -46,10 +46,18 @@ INCPRE+=$(LIBCMIS_CFLAGS)
 CMISLIB=-lcmislib
 .ENDIF

+.IF "$(SYSTEM_BOOST)"=="YES"
+DATETIMELIB=...
+.ELSE
+DATETIMELIB=lboostdatetime
+.ENDIF
+
 .ELSE

 CMISLIB=$(LIBPRE) cmislib.lib

+DATETIMELIB=$(LIBPRE) boostdatetime.lib
+
 .ENDIF

 SLOFILES= \
@@ -66,6 +74,7 @@ SHL1STDLIBS = \
    $(TOOLSLIB) \
    $(CMISLIB) \
    $(CURLLIB) \
+   $(DATETIMELIB) \
    $(LIBXML2LIB)

 SHL1VERSIONMAP = $(SOLARENV)/src/component.map