diff --git a/documentation/RELEASE_NOTES.html b/documentation/RELEASE_NOTES.html
index 6bd9a4a1d..ea0239e6a 100644
--- a/documentation/RELEASE_NOTES.html
+++ b/documentation/RELEASE_NOTES.html
@@ -236,10 +236,10 @@ implementations have been converted from K&amp;R to ANSI C prototypes.</p>
 <h4>Added Perl5 CA library</h4>
 
 <p>Base now provides a CA client library interface for Perl5 scripts in
-<tt>src/cap5</tt> and includes some alternative implementations of the catools
-programs written in Perl (for demonstration purposes mainly). Documentation on
-how to use the library is available in html/CA.html after the build
-completes.</p>
+<tt>src/cap5</tt> and includes as examples some implementations of the catools
+programs written in Perl. Documentation on how to use the Perl library is
+available in <tt>base/html/CA.html</tt> after the build completes. This library
+cannot currently be built on Windows targets.</p>
 
 <h4>IOC ignores SIGHUP</h4>
 
diff --git a/src/cap5/Makefile b/src/cap5/Makefile
index 9f052e278..dc2c7236a 100644
--- a/src/cap5/Makefile
+++ b/src/cap5/Makefile
@@ -43,18 +43,15 @@ endif
 include $(TOP)/configure/RULES
 
 ifdef T_A
-  PERL5_DIR = $(dir $(shell $(PERL) ../perlConfig.pl perl5))
-  XSUBPP = $(PERL5_DIR)xsubpp$(BAT)
-  PODCHECKER = $(PERL5_DIR)podchecker$(BAT)
-  TYPEMAP = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils/typemap
+  EXTUTILS = $(shell $(PERL) ../perlConfig.pl privlib)/ExtUtils
 
   %.c: ../%.xs
 	$(RM) $@ $@_new
-	$(XSUBPP) -typemap $(TYPEMAP) $< > $@_new && $(MV) $@_new $@
+	$(PERL) $(EXTUTILS)/xsubpp -typemap $(EXTUTILS)/typemap $< > $@_new && $(MV) $@_new $@
 
   %.html: %.pm
 	$(RM) $@
-	$(PODCHECKER) $< && pod2html --infile=$< --outfile=$@
+	podchecker $< && pod2html --infile=$< --outfile=$@
 
   clean::
 	$(RM) Cap5.c