diff --git a/examples/Makefile.am b/examples/Makefile.am
index 54c479db..958ebd58 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -119,4 +119,9 @@ dist_man_MANS = \
 		pn53x-sam.1 \
 		pn53x-tamashell.1
 
+if HAS_LOG4C
+  AM_CFLAGS += @log4c_CFLAGS@
+  LIBADD = @log4c_LIBS@
+endif
+
 EXTRA_DIST = CMakeLists.txt
diff --git a/include/nfc/Makefile.am b/include/nfc/Makefile.am
index 9d8bd891..eb2e69f5 100644
--- a/include/nfc/Makefile.am
+++ b/include/nfc/Makefile.am
@@ -1,5 +1,6 @@
 
 nfcinclude_HEADERS = \
+		     iso7816.h \
 		     nfc.h \
 		     nfc-emulation.h \
 		     nfc-types.h
diff --git a/libnfc/Makefile.am b/libnfc/Makefile.am
index 5af2476b..e58779a6 100644
--- a/libnfc/Makefile.am
+++ b/libnfc/Makefile.am
@@ -34,8 +34,8 @@ if LIBUSB_ENABLED
 endif
 
 if HAS_LOG4C
-  libnfc_la_CFLAGS += $(log4c_CFLAGS)
-  libnfc_la_LIBADD += $(log4c_LIBS)
+  libnfc_la_CFLAGS += @log4c_CFLAGS@
+  libnfc_la_LIBADD += @log4c_LIBS@
 
   libnfc_la_SOURCES += log.c
 endif
diff --git a/libnfc/buses/Makefile.am b/libnfc/buses/Makefile.am
index 6882dada..f3475c44 100644
--- a/libnfc/buses/Makefile.am
+++ b/libnfc/buses/Makefile.am
@@ -8,3 +8,8 @@ libnfcbuses_la_SOURCES = uart.c
 libnfcbuses_la_CFLAGS = -I$(top_srcdir)/libnfc
 
 EXTRA_DIST = uart_posix.c uart_win32.c
+
+if HAS_LOG4C
+  libnfcbuses_la_CFLAGS += @log4c_CFLAGS@
+  libnfcbuses_la_LIBADD = @log4c_LIBS@
+endif
diff --git a/libnfc/chips/Makefile.am b/libnfc/chips/Makefile.am
index 94be1fa0..a8ad491f 100644
--- a/libnfc/chips/Makefile.am
+++ b/libnfc/chips/Makefile.am
@@ -6,3 +6,10 @@ noinst_HEADERS = pn53x.h pn53x-internal.h
 noinst_LTLIBRARIES = libnfcchips.la
 libnfcchips_la_SOURCES = pn53x.c
 libnfcchips_la_CFLAGS = -I$(top_srcdir)/libnfc
+
+
+if HAS_LOG4C
+  libnfcchips_la_CFLAGS += @log4c_CFLAGS@
+  libnfcchips_la_LIBADD = @log4c_LIBS@
+endif
+
diff --git a/libnfc/drivers/Makefile.am b/libnfc/drivers/Makefile.am
index 0ac2250c..5ea129e4 100644
--- a/libnfc/drivers/Makefile.am
+++ b/libnfc/drivers/Makefile.am
@@ -34,3 +34,8 @@ if LIBUSB_ENABLED
   libnfcdrivers_la_LIBADD  += @libusb_LIBS@
 endif
 
+if HAS_LOG4C
+  libnfcdrivers_la_CFLAGS += @log4c_CFLAGS@
+  libnfcdrivers_la_LIBADD += @log4c_LIBS@
+endif
+