diff --git a/sm/Makefile.am b/sm/Makefile.am
index 9e768aaf1..b2f042de8 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -79,7 +79,7 @@ module_maint_tests = t-minip12
 
 t_common_src =
 t_common_ldadd = $(libcommon) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) \
-                 $(GPG_ERROR_LIBS) $(LIBINTL)
+                 $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
 
 
 t_minip12_CFLAGS = -DWITHOUT_NPTH=1 \
diff --git a/tools/gpg-card.c b/tools/gpg-card.c
index d9d626c5f..07e9232ec 100644
--- a/tools/gpg-card.c
+++ b/tools/gpg-card.c
@@ -22,6 +22,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #ifdef HAVE_LIBREADLINE
 # define GNUPG_LIBREADLINE_H_INCLUDED
 # include <readline/readline.h>