diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index 27dba295a..4d4798ac9 100644
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -2,19 +2,22 @@ ipsec_PROGRAMS = openac
 openac_SOURCES = openac.c build.c build.h loglite.c
 
 PLUTODIR=$(top_srcdir)/src/pluto
+WHACKDIR=$(top_srcdir)/src/whack
 LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+LIBFREESWANDIR=$(top_srcdir)/src/libfreeswan
+LIBCRYPTODIR=$(top_srcdir)/src/libcrypto
 
 INCLUDES = \
--I$(top_srcdir)/src/libfreeswan \
+-I$(LIBFREESWAN) \
 -I$(LIBSTRONGSWANDIR)\
 -I$(PLUTODIR) \
--I$(top_srcdir)/src/libcrypto \
--I$(top_srcdir)/src/whack
+-I$(LIBCRYPTODIR) \
+-I$(WHACKDIR)
 
 AM_CFLAGS = -DDEBUG -DNO_PLUTO -DIPSEC_CONFDIR=\"${confdir}\"
 openac_LDADD = ac.o asn1.o ca.o certs.o constants.o crl.o defs.o mp_defs.o fetch.o id.o keys.o lex.o \
                md2.o md5.o ocsp.o oid.o pem.o pgp.o pkcs1.o rnd.o sha1.o smartcard.o x509.o \
-               $(top_srcdir)/src/libfreeswan/libfreeswan.a $(top_srcdir)/src/libcrypto/libcrypto.a \
+               $(LIBFREESWANDIR)/libfreeswan.a $(LIBCRYPTODIR)/libcrypto.a \
                -lgmp
 
 # This compile option activates dynamic URL fetching using libcurl
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 38fb1cbf9..336bbdfea 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -68,6 +68,9 @@ rsaref/pkcs11t.h rsaref/pkcs11.h rsaref/unix.h rsaref/pkcs11f.h
 _pluto_adns_SOURCES = adns.c adns.h
 
 LIBSTRONGSWANDIR=$(top_srcdir)/src/libstrongswan
+LIBFREESWANDIR=$(top_srcdir)/src/libfreeswan
+LIBCRYPTODIR=$(top_srcdir)/src/libcrypto
+
 
 INCLUDES = \
 -I${linuxdir} \
@@ -86,12 +89,12 @@ AM_CFLAGS = \
 
 pluto_LDADD = \
 oid.o \
-$(top_srcdir)/src/libfreeswan/libfreeswan.a \
-$(top_srcdir)/src/libcrypto/libcrypto.a \
+$(LIBFREESWANDIR)/libfreeswan.a \
+$(LIBCRYPTODIR)/libcrypto.a \
 -lgmp -lresolv -lpthread -ldl
 
 _pluto_adns_LDADD = \
-$(top_srcdir)/src/libfreeswan/libfreeswan.a \
+$(LIBFREESWANDIR)/libfreeswan.a \
 -lresolv -ldl
 
 dist_man_MANS = pluto.8 ipsec.secrets.5