diff -Nurd -x'*~' msmtp-1.4.17.orig/doc/Makefile.in msmtp-1.4.17/doc/Makefile.in
--- msmtp-1.4.17.orig/doc/Makefile.in	2008-12-25 11:27:21.000000000 -0500
+++ msmtp-1.4.17/doc/Makefile.in	2012-10-02 16:50:46.000000000 -0400
@@ -926,15 +926,6 @@
 	  done; \
 	done
 	@$(POST_INSTALL)
-	@if (install-info --version && \
-	     install-info --version 2>&1 | sed 1q | grep -i -v debian) >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    relfile=`echo "$$file" | sed 's|^.*/||'`; \
-	    echo " install-info --info-dir='$(DESTDIR)$(infodir)' '$(DESTDIR)$(infodir)/$$relfile'";\
-	    install-info --info-dir="$(DESTDIR)$(infodir)" "$(DESTDIR)$(infodir)/$$relfile" || :;\
-	  done; \
-	else : ; fi
 install-man: install-man1
 
 install-pdf: install-pdf-am
diff -Nurd -x'*~' msmtp-1.4.17.orig/src/tls.c msmtp-1.4.17/src/tls.c
--- msmtp-1.4.17.orig/src/tls.c	2008-12-25 12:58:43.000000000 -0500
+++ msmtp-1.4.17/src/tls.c	2012-10-02 16:38:55.000000000 -0400
@@ -813,7 +813,7 @@
     char *buf;
     int bufsize;
     /* needed to get the DNS subjectAltNames: */
-    STACK *subj_alt_names;
+    void *subj_alt_names;
     int subj_alt_names_count;
     GENERAL_NAME *subj_alt_name;
     /* did we find a name matching hostname? */