diff --git a/Makefile.am b/Makefile.am
index ce2d608c..77d9b38c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,9 @@ MAINTAINERCLEANFILES = \
 	$(srcdir)/install-sh $(srcdir)/ltmain.sh $(srcdir)/missing \
 	$(srcdir)/depcomp $(srcdir)/aclocal.m4 \
 	$(srcdir)/config.guess $(srcdir)/config.sub \
-	$(srcdir)/aclocal/ltsugar.m4 $(srcdir)/aclocal/libtool.m4 \
-	$(srcdir)/aclocal/ltversion.m4 $(srcdir)/aclocal/lt~obsolete.m4 \
-	$(srcdir)/aclocal/ltoptions.m4 \
+	$(srcdir)/m4/ltsugar.m4 $(srcdir)/m4/libtool.m4 \
+	$(srcdir)/m4/ltversion.m4 $(srcdir)/m4/lt~obsolete.m4 \
+	$(srcdir)/m4/ltoptions.m4 \
 	$(srcdir)/packaged
 EXTRA_DIST = Makefile.mak svnignore
 
diff --git a/src/libopensc/Makefile.am b/src/libopensc/Makefile.am
index 1f5ba599..1f39d61d 100644
--- a/src/libopensc/Makefile.am
+++ b/src/libopensc/Makefile.am
@@ -16,7 +16,7 @@ noinst_HEADERS = cards.h ctbcs.h internal.h esteid.h muscle.h muscle-filesystem.
 pkgconfig_DATA = libopensc.pc libpkcs15init.pc libscconf.pc
 
 AM_CFLAGS = $(OPTIONAL_OPENSSL_CFLAGS) $(OPTIONAL_OPENCT_CFLAGS) \
-	$(OPTIONAL_ZLIB_CFLAGS) $(LTLIB_CFLAGS) 
+	$(OPTIONAL_ZLIB_CFLAGS) $(LTLIB_CFLAGS) -prefer-pic
 INCLUDES = -I$(top_builddir)/src/include -I$(top_srcdir)/src/common
 
 libopensc_la_SOURCES = \