diff --git a/client/getpasswd.c b/client/getpasswd.c
index f554fb41..0b95c7fa 100644
--- a/client/getpasswd.c
+++ b/client/getpasswd.c
@@ -218,7 +218,7 @@ get_key_file(char *key, int *key_len, const char *key_file,
     fko_ctx_t ctx, const fko_cli_options_t *options)
 {
     FILE           *pwfile_ptr;
-    unsigned int    numLines = 0, i = 0, found_dst;
+    unsigned int    i = 0, found_dst;
 
     char            conf_line_buf[MAX_LINE_LEN] = {0};
     char            tmp_char_buf[MAX_LINE_LEN]  = {0};
@@ -234,7 +234,6 @@ get_key_file(char *key, int *key_len, const char *key_file,
 
     while ((fgets(conf_line_buf, MAX_LINE_LEN, pwfile_ptr)) != NULL)
     {
-        numLines++;
         conf_line_buf[MAX_LINE_LEN-1] = '\0';
         lptr = conf_line_buf;
 
diff --git a/common/Makefile.am b/common/Makefile.am
index ae1e02bc..55d8d76b 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -12,7 +12,7 @@ libfko_util_a_SOURCES    	= $(libfko_util_source_files)
 
 if USE_MINGW
 EXTRA_libfko_util_a_SOURCES = ../win32/getlogin.c ../win32/getlogin.h
-libfko_util_a_LDFLAGS = -lwsock32 -lws2_32
+libfko_util_a_LIBADD = -lwsock32 -lws2_32
 endif
 
 AM_CPPFLAGS         		= $(GPGME_CFLAGS) -I $(top_srcdir)/common -I $(top_srcdir)/lib
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a2902f57..b2c6d884 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS    = info-in-builddir
+
 CLEANFILES          = libfko.info
 
 info_TEXINFOS       = libfko.texi