--- a/cmd/manifest.mn
+++ b/cmd/manifest.mn
@@ -3,34 +3,41 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DEPTH	= ..
 # MODULE	= seccmd
 
 SOFTOKEN_SRCDIRS=
 NSS_SRCDIRS=
+LIB_SRCDIR=
 
 ifdef NSS_BUILD_UTIL_ONLY
 REQUIRES = nspr
+LIB_SRCDIR = \
+ $(NULL)
 else
 REQUIRES = nss nspr libdbm
+LIB_SRCDIR = \
+ $(LIB_SRCDIR) \
+ $(NULL)
 endif
 
 ifndef NSS_BUILD_UTIL_ONLY
 SOFTOKEN_SRCDIRS = \
  lib  \
  $(BLTEST_SRCDIR) \
  $(FIPSTEST_SRCDIR)  \
  $(LOWHASHTEST_SRCDIR)  \
  $(SHLIBSIGN_SRCDIR) \
  $(NULL)
 endif
 
 ifndef NSS_BUILD_SOFTOKEN_ONLY
+ifndef NSS_BUILD_UTIL_ONLY
 NSS_SRCDIRS = \
  addbuiltin \
  atob  \
  btoa  \
  certcgi \
  certutil  \
  chktest  \
  crlutil  \
@@ -66,16 +73,20 @@ NSS_SRCDIRS = \
  strsclnt \
  symkeyutil \
  tests \
  tstclnt  \
  vfychain \
  vfyserv \
  modutil \
  $(NULL)
+else
+NSS_SRCDIRS = \
+ $(NULL)
+endif
 endif
 
 DIRS += \
  $(SOFTOKEN_SRCDIRS) \
  $(NSS_SRCDIRS)
 
 TEMPORARILY_DONT_BUILD = \
  $(NULL)