diff --git a/configure.in b/configure.in
index 2b58f7893bf7..550b3a227f06 100644
--- a/configure.in
+++ b/configure.in
@@ -4632,13 +4632,10 @@ if test -n "$with_system_libcmis" -a "$with_system_libcmis" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_LIBCMIS=YES
     PKG_CHECK_MODULES( LIBCMIS, libcmis-0.2 )
-elif test $_os != WINNT; then
+else
     AC_MSG_RESULT([internal])
     SYSTEM_LIBCMIS=NO
     BUILD_TYPE="$BUILD_TYPE LIBCMIS"
-else
-    AC_MSG_RESULT([none])
-    SYSTEM_LIBCMIS=YES
 fi
 AC_SUBST(SYSTEM_LIBCMIS)
 AC_SUBST(LIBCMIS_CFLAGS)
diff --git a/ucb/prj/build.lst b/ucb/prj/build.lst
index 5fc0179eb860..350d3f92a159 100644
--- a/ucb/prj/build.lst
+++ b/ucb/prj/build.lst
@@ -16,7 +16,7 @@ uc	ucb\source\ucp\tdoc			nmake	-	all	uc_tdoc uc_inc NULL
 uc	ucb\source\ucp\expand		nmake	-	all	uc_expand uc_inc NULL
 uc	ucb\source\ucp\ext		    nmake	-	all	uc_ext uc_inc NULL
 uc	ucb\source\ucp\odma			nmake	-	w	uc_odma uc_inc NULL
-uc	ucb\source\ucp\cmis			nmake	-	u	uc_cmis uc_inc NULL
+uc	ucb\source\ucp\cmis			nmake	-	all	uc_cmis uc_inc NULL
 #uc      ucb\qa\complex\ucb              nmake   -       all     uc_complex_ucb uc_inc NULL
 # fails, please fix
 # uc      ucb\qa\complex\tdoc             nmake   -       all     uc_complex_tdoc uc_complex_tdoc_interfaces uc_inc NULL