--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,12 +10,6 @@ lib_LIBRARIES =
 lib_LTLIBRARIES =
 if !REMOTE_ONLY
 lib_LTLIBRARIES += libunwind.la
-if BUILD_PTRACE
-lib_LTLIBRARIES += libunwind-ptrace.la
-endif
-if BUILD_COREDUMP
-lib_LTLIBRARIES += libunwind-coredump.la
-endif
 endif
 
 noinst_HEADERS =
@@ -50,6 +44,7 @@ libunwind_ptrace_la_SOURCES =						  \
 	ptrace/_UPT_put_unwind_info.c ptrace/_UPT_get_proc_name.c	  \
 	ptrace/_UPT_reg_offset.c ptrace/_UPT_resume.c
 noinst_HEADERS += ptrace/_UPT_internal.h
+libunwind_ptrace_la_LIBADD = libunwind-$(arch).la
 
 ### libunwind-coredump:
 libunwind_coredump_la_SOURCES = \
@@ -68,7 +63,7 @@ libunwind_coredump_la_SOURCES = \
 	coredump/_UPT_resume.c
 libunwind_coredump_la_LDFLAGS = $(COMMON_SO_LDFLAGS) \
 				-version-info $(COREDUMP_SO_VERSION)
-libunwind_coredump_la_LIBADD = $(LIBLZMA) $(LIBZ)
+libunwind_coredump_la_LIBADD = $(LIBLZMA) $(LIBZ) libunwind-$(arch).la
 noinst_HEADERS += coredump/_UCD_internal.h coredump/_UCD_lib.h
 
 ### libunwind-setjmp:
@@ -725,6 +720,15 @@ if BUILD_SETJMP
 lib_LTLIBRARIES += libunwind-setjmp.la
 endif
 
+if !REMOTE_ONLY
+if BUILD_COREDUMP
+lib_LTLIBRARIES += libunwind-coredump.la
+endif
+if BUILD_PTRACE
+lib_LTLIBRARIES += libunwind-ptrace.la
+endif
+endif
+
 #
 # Don't link with standard libraries, because those may mention
 # libunwind already.