diff --git a/npa/Makefile.am b/npa/Makefile.am
index 543259e..51779ca 100644
--- a/npa/Makefile.am
+++ b/npa/Makefile.am
@@ -21,7 +21,8 @@ do_subst = sed \
 			#> src/libopensc/Makefile.am
 do_export = cp $(abs_srcdir)/Makefile.am.opensc src/libopensc/Makefile.am
 
-opensc_img = $(abs_srcdir)/src/opensc/win32/build/image/opensc
+opensc_img = $(abs_srcdir)/src/opensc/win32/build/image
+opensc_root = $(opensc_img)/opensc
 
 fixup_la = find "$(opensc_img)" -name '*.la' | while read f; do \
 		   top="$$(dirname "$$(dirname "$$(echo "$${f}")")" | sed 's\#//\#/\#g')" \
@@ -34,29 +35,29 @@ restore_la = find "$(opensc_img)" -name '*.la' | while read f; do \
 			 mv "$${f}.tmp" "$${f}"; \
 			 done
 
-$(opensc_img)/lib/libopensc.la:
+$(opensc_root)/lib/libopensc.la:
 	cd $(top_srcdir)/src/opensc && \
 		./bootstrap && \
 		./configure --disable-doc && \
 		EXTRA_OPENSC_CONFIG="`$(do_export)`" OPENSSL_VERSION="1.0.0e" OPENSSL_URL="https://www2.informatik.hu-berlin.de/~morgner/files/openssl-1.0.0e.tar.gz" EXTRA_OPENSSL_CONFIG="experimental-pace" win32/installer_from_build.sh
 
-$(opensc_img)/lib/libnpa.la: $(opensc_img)/lib/libopensc.la
+$(opensc_root)/lib/libnpa.la: $(opensc_root)/lib/libopensc.la
 	$(fixup_la)
 	export ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes; ./configure \
 		--sbindir=/bin \
 		--prefix=/ \
 		--host=i586-mingw32msvc \
-		--build=i686-pc-linux-gnu \
+		--build=$(shell gcc -dumpmachine) \
 		--program-prefix='' \
-		PKG_CONFIG_PATH="$(opensc_img)/lib/pkgconfig" \
-		PKG_CONFIG_SYSROOT_DIR="$(opensc_img)" \
-		OPENSC_LIBS="-L$(opensc_img)/lib -lopensc"
-	make install DESTDIR="$(opensc_img)"
+		PKG_CONFIG_PATH="$(opensc_root)/lib/pkgconfig" \
+		PKG_CONFIG_SYSROOT_DIR="$(opensc_root)" \
+		OPENSC_LIBS="-L$(opensc_root)/lib -lopensc"
+	make install DESTDIR="$(opensc_root)"
 	$(restore_la)
 
-win-opensc: $(opensc_img)/lib/libopensc.la
+win-opensc: $(opensc_root)/lib/libopensc.la
 
-win: $(opensc_img)/lib/libnpa.la
+win: $(opensc_root)/lib/libnpa.la
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnpa.pc
diff --git a/npa/configure.ac b/npa/configure.ac
index 4ebf222..cbd145e 100644
--- a/npa/configure.ac
+++ b/npa/configure.ac
@@ -72,7 +72,6 @@ AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
-AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 
 # Checks for library functions.
diff --git a/npa/src/npa-tool.c b/npa/src/npa-tool.c
index 5a8c847..d0aad5f 100644
--- a/npa/src/npa-tool.c
+++ b/npa/src/npa-tool.c
@@ -343,8 +343,8 @@ main (int argc, char **argv)
     if (dobreak) {
         /* The biggest buffer sprintf could write with "%llu" */
         char secretbuf[strlen("18446744073709551615")+1];
-        uint64_t secret = 0;
-        uint64_t maxsecret = 0;
+        unsigned long long secret = 0;
+        unsigned long long maxsecret = 0;
 
         if (usepin) {
             pace_input.pin_id = PACE_PIN;
@@ -383,7 +383,7 @@ main (int argc, char **argv)
         } else if (usepuk) {
             pace_input.pin_id = PACE_PUK;
             pace_input.pin_length = 10;
-            maxsecret = 9999999999;
+            maxsecret = 9999999999LLU;
             if (puk) {
                 if (sscanf(puk, "%llu", &secret) != 1) {
                     fprintf(stderr, "%s is not an unsigned long long.\n",