--- src/gpgme-config.in.orig
+++ src/gpgme-config.in
@@ -23,7 +23,7 @@ libs="-L@libdir@"
 
 # Network libraries.
 assuan_cflags="@LIBASSUAN_CFLAGS@"
-assuan_libs="@LIBASSUAN_LIBS@"
+#assuan_libs="@LIBASSUAN_LIBS@"
 
 # Configure libgpg-error.
 gpg_error_cflags="@GPG_ERROR_CFLAGS@"
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -206,12 +206,13 @@ libgpgme_la_DEPENDENCIES = @LTLIBOBJS@ $
 libgpgme_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
 	             @GPG_ERROR_LIBS@
 
+libgpgme_pthread_la_CFLAGS = -pthread
 libgpgme_pthread_la_LDFLAGS = $(no_undefined) $(export_symbols) \
 	$(libgpgme_version_script_cmd) -version-info \
 	@LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@
 libgpgme_pthread_la_DEPENDENCIES = @LTLIBOBJS@ $(srcdir)/libgpgme.vers
 libgpgme_pthread_la_LIBADD = $(gpgme_res) @LIBASSUAN_LIBS@ @LTLIBOBJS@ \
-	-lpthread @GPG_ERROR_LIBS@
+	@GPG_ERROR_LIBS@
 
 libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ $(no_undefined) $(export_symbols) \
 	$(libgpgme_version_script_cmd) -version-info \
--- configure.ac.orig
+++ configure.ac
@@ -80,7 +80,7 @@ AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
 # Enable GNU extensions on systems that have them.
-AC_GNU_SOURCE
+AC_USE_SYSTEM_EXTENSIONS
 
 AH_VERBATIM([_REENTRANT],
 [/* To allow the use of GPGME in multithreaded programs we have to use
@@ -91,7 +91,7 @@ AH_VERBATIM([_REENTRANT],
 # define _REENTRANT 1
 #endif])
 
-AC_PROG_CC
+AC_PROG_CC_STDC
 AC_PROG_CXX
 
 AC_SUBST(LIBGPGME_LT_CURRENT)