diff --git a/src/cap5/Makefile b/src/cap5/Makefile
index 4707c1621..e015ff825 100644
--- a/src/cap5/Makefile
+++ b/src/cap5/Makefile
@@ -9,17 +9,16 @@ TOP=../..
 include $(TOP)/configure/CONFIG
 
 
-# Use hdepends command (not GNU compiler flags)
-# to generate header file dependancies for Darwin.
-# Darwin has multiple -arch compiler flags.
+# Special settings for Darwin:
 ifeq ($(OS_CLASS),Darwin)
-HDEPENDS_METHOD = CMD
-endif
+  # Use hdepends command (not GNU compiler flags)
+  # to generate header file dependancies for Darwin.
+  # Darwin has multiple -arch compiler flags.
+  HDEPENDS_METHOD = CMD
 
-ifneq ($(findstring darwin,$(T_A)),)
   # Perl loadable libraries on Darwin have funny names
   LOADABLE_SHRLIB_PREFIX =
-  LOADABLE_SHRLIB_SUFFIX = .bundle
+  LOADABLE_SHRLIB_SUFFIX = .$(shell $(PERL) ../perlConfig.pl dlext)
 endif
 
 PERL_VERSION = $(shell $(PERL) ../perlConfig.pl version)