diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index 4f19de874cac..a7825d994296 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -11,6 +11,9 @@ CFLAGS+=		-mno-fp-regs
 CFLAGS+=		-mpreferred-stack-boundary=2
 .endif
 .ifmake testmain
+.if HAVE_PNP
+CFLAGS+=			-DHAVE_PNP
+.endif
 CFLAGS+=			-DTESTMAIN -D_TESTMAIN
 SRCS+=				testmain.c
 PROG=			testmain
diff --git a/sys/boot/ficl/loader.c b/sys/boot/ficl/loader.c
index 34bdb7fee3ee..5f32134ec92b 100644
--- a/sys/boot/ficl/loader.c
+++ b/sys/boot/ficl/loader.c
@@ -242,6 +242,8 @@ ficlFindfile(FICL_VM *pVM)
 	return;
 }
 
+#ifdef HAVE_PNP
+
 void
 ficlPnpdevices(FICL_VM *pVM)
 {
@@ -272,6 +274,8 @@ ficlPnphandlers(FICL_VM *pVM)
 	return;
 }
 
+#endif
+
 void
 ficlCcall(FICL_VM *pVM)
 {
diff --git a/sys/boot/ficl/words.c b/sys/boot/ficl/words.c
index 0136610354d9..36ea902148af 100644
--- a/sys/boot/ficl/words.c
+++ b/sys/boot/ficl/words.c
@@ -4833,8 +4833,10 @@ void ficlCompileCore(FICL_DICT *dp)
     dictAppendWord(dp, "copyin",    ficlCopyin,	    FW_DEFAULT);
     dictAppendWord(dp, "copyout",   ficlCopyout,    FW_DEFAULT);
     dictAppendWord(dp, "findfile",  ficlFindfile,   FW_DEFAULT);
+#ifdef HAVE_PNP
     dictAppendWord(dp, "pnpdevices",ficlPnpdevices, FW_DEFAULT);
     dictAppendWord(dp, "pnphandlers",ficlPnphandlers, FW_DEFAULT);
+#endif
     dictAppendWord(dp, "ccall",	    ficlCcall,	    FW_DEFAULT);
 #endif