diff --git a/autogen.sh b/autogen.sh
index 4e7011a5..5b883a6a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1 +1,5 @@
-autoreconf -vif
+#!/bin/sh
+set -e
+srcdir="$(dirname $0)"
+cd "$srcdir"
+autoreconf --install --force
diff --git a/configure.ac b/configure.ac
index 0f99675f..34509993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -376,7 +376,11 @@ fi
 
 dnl Check for libminiupnpc (optional)
 if test x$use_upnp != xno; then
-  AC_CHECK_LIB([miniupnpc], [main],, [have_miniupnpc=no])
+  AC_CHECK_HEADERS(
+    [miniupnpc/miniwget.h miniupnpc/miniupnpc.h miniupnpc/upnpcommands.h miniupnpc/upnperrors.h],
+    [AC_CHECK_LIB([miniupnpc], [main],, [have_miniupnpc=no])],
+    [have_miniupnpc=no]
+  )
 fi
 
 dnl Check for boost libs
diff --git a/src/Makefile.am b/src/Makefile.am
index 89879d5c..df4087c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,5 +135,4 @@ EXTRA_DIST = leveldb Makefile.include
 
 clean-local:
 	-$(MAKE) -C leveldb clean
-	rm -f leveldb/port/*.gcno leveldb/db/*.gcno leveldb/table/*.gcno leveldb/helpers/*.gcno
-	rm -f leveldb/util/*.gcno leveldb/helpers/memenv/*.gcno
+	rm -f leveldb/*/*.gcno leveldb/helpers/memenv/*.gcno