diff --git a/src/Makefile.am b/src/Makefile.am
index 54329a8..133ceef 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,57 +1,75 @@
 # Makefile.am - main makefile for dialogs part of GpgEX
 # Copyright (C) 2005, 2007, 2013 g10 Code GmbH
 #
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 #
 # This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 ## Process this file with automake to produce Makefile.in
 
 bin_PROGRAMS = gpgex
 EXTRA_DIST = versioninfo.rc.in gpgex.manifest.in \
 	     GNU.GnuPG.Gcc64Support.manifest gnupg.ico \
 	     gpgex_logo.svg standalone.svg
 EXEEXT = .dll
 
 AM_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -shared
 AM_CXXFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) -shared
 
 ICONS = icon-16.png
 
 nodist_gpgex_SOURCES = versioninfo.rc gpgex.manifest
 gpgex_SOURCES = 				\
 	gpgex.def				\
 	registry.h registry.c			\
 	exechelp.h exechelp.c			\
 	gpgex-class.h gpgex-class.cc		\
 	gpgex-factory.h gpgex-factory.cc	\
 	gpgex.h gpgex.cc			\
 	client.h client.cc			\
 	main.h debug.h main.cc				\
 	resource.h \
 	$(ICONS)
 
+if HAVE_W64_SYSTEM
+libgpg-error.a:
+	if [ -e "$$($(GPG_ERROR_CONFIG) --prefix)/lib64/libgpg-error.a" ]; then \
+		ln -sf $$($(GPG_ERROR_CONFIG) --prefix)/lib64/libgpg-error.a .; \
+	else \
+		ln -sf $$($(GPG_ERROR_CONFIG) --prefix)/lib/libgpg-error.a .; \
+	fi
+else
 libgpg-error.a:
 	ln -sf $$($(GPG_ERROR_CONFIG) --prefix)/lib/libgpg-error.a .
+endif
 
+if HAVE_W64_SYSTEM
+libassuan.a:
+	if [ -e "$$($(LIBASSUAN_CONFIG) --prefix)/lib64/libassuan.a" ]; then \
+		ln -sf $$($(LIBASSUAN_CONFIG) --prefix)/lib64/libassuan.a .; \
+	else \
+		ln -sf $$($(LIBASSUAN_CONFIG) --prefix)/lib/libassuan.a .; \
+	fi
+else
 libassuan.a:
 	ln -sf $$($(LIBASSUAN_CONFIG) --prefix)/lib/libassuan.a .
+endif
 
 clean-local:
 	rm -f libgpg-error.a libassuan.a
 
 #gpgex_LDADD = $(srcdir)/gpgex.def		\
 #	-L . -lshell32  -lcomdlg32 -ladvapi32
 
 gpgex_LDFLAGS = -static-libgcc -static-libstdc++
 # We need -loleaut32 for start_help() in gpgex.cc.
 gpgex_LDADD = $(srcdir)/gpgex.def -L . \
 	-lshell32 -lgdi32 -lole32 -luuid -lgdiplus \
 	./libassuan.a ./libgpg-error.a -lws2_32 -loleaut32
 
 .rc.o:
 	$(WINDRES) -I $(srcdir) -I . `test -f '$<' || echo '$(srcdir)/'`$< $@