diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8a0530d..5f58eed 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,13 +1,13 @@
 SUBDIRS =
 
-if CRYB_CIPHER
-SUBDIRS += cipher
-endif CRYB_CIPHER
-
 if CRYB_CORE
 SUBDIRS += core
 endif CRYB_CORE
 
+if CRYB_CIPHER
+SUBDIRS += cipher
+endif CRYB_CIPHER
+
 if CRYB_CPE
 SUBDIRS += cpe
 endif CRYB_CPE
diff --git a/lib/cipher/Makefile.am b/lib/cipher/Makefile.am
index 60dd5d5..086cf91 100644
--- a/lib/cipher/Makefile.am
+++ b/lib/cipher/Makefile.am
@@ -7,3 +7,6 @@ libcryb_cipher_la_SOURCES = \
 	cryb_rc4.c \
 	\
 	cryb_cipher.c
+
+libcryb_cipher_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la
diff --git a/lib/digest/Makefile.am b/lib/digest/Makefile.am
index 25a8453..50aaab2 100644
--- a/lib/digest/Makefile.am
+++ b/lib/digest/Makefile.am
@@ -20,3 +20,6 @@ dist_man3_MANS = \
 	cryb_sha256.3 \
 	cryb_sha384.3 \
 	cryb_sha512.3
+
+libcryb_digest_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la
diff --git a/lib/enc/Makefile.am b/lib/enc/Makefile.am
index a7f2541..941b62d 100644
--- a/lib/enc/Makefile.am
+++ b/lib/enc/Makefile.am
@@ -14,3 +14,6 @@ libcryb_enc_la_SOURCES = \
 
 dist_man3_MANS = \
 	cryb_percent.3
+
+libcryb_enc_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la
diff --git a/lib/hash/Makefile.am b/lib/hash/Makefile.am
index 62d90e9..057cc8b 100644
--- a/lib/hash/Makefile.am
+++ b/lib/hash/Makefile.am
@@ -18,3 +18,6 @@ dist_man3_MANS = \
 	cryb_pearson.3 \
 	\
 	cryb_hash.3
+
+libcryb_hash_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la
diff --git a/lib/mac/Makefile.am b/lib/mac/Makefile.am
index e7e4d11..1741811 100644
--- a/lib/mac/Makefile.am
+++ b/lib/mac/Makefile.am
@@ -12,4 +12,5 @@ libcryb_mac_la_SOURCES = \
 	cryb_mac.c
 
 libcryb_mac_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la \
 	$(top_builddir)/lib/digest/libcryb-digest.la
diff --git a/lib/mpi/Makefile.am b/lib/mpi/Makefile.am
index b10eb82..bd17891 100644
--- a/lib/mpi/Makefile.am
+++ b/lib/mpi/Makefile.am
@@ -27,3 +27,6 @@ libcryb_mpi_la_SOURCES = \
 
 noinst_HEADERS = \
 	cryb_mpi_impl.h
+
+libcryb_mpi_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la
diff --git a/lib/test/Makefile.am b/lib/test/Makefile.am
index a3b6fc8..b61d0a6 100644
--- a/lib/test/Makefile.am
+++ b/lib/test/Makefile.am
@@ -9,3 +9,6 @@ libcryb_test_la_SOURCES = \
 	cryb_t_malloc.c \
 	\
 	cryb_test.c
+
+libcryb_test_la_LIBADD = \
+	$(top_builddir)/lib/core/libcryb-core.la