diff --git a/Makefile.am b/Makefile.am
index f3c8a930..ee19e9c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,6 @@ SUBDIRS = \
 	test
 
 EXTRA_DIST= \
-	autogen.sh \
 	rak/address_info.h \
 	rak/algorithm.h \
 	rak/allocators.h \
diff --git a/README b/README
index f2aca1ee..836ab808 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 BUILDING
 
- Run "./autogen.sh" to generate the configure scripts if
-necessary. The man page "doc/rtorrent.1" must be generated with
-"docbook2man rtorrent.1.xml" if it is missing.
+ Run "aclocal -I scripts && autoconf -i && autoheader && automake --add-missing"
+to generate the configure scripts if necessary. The man page "doc/rtorrent.1"
+must be generated with "docbook2man rtorrent.1.xml" if it is missing.
 
  Note that rtorrent follows the development of libtorrent closely, and
 thus the versions must be in sync. This should not be nessesary in the
diff --git a/configure.ac b/configure.ac
index b407c89a..ca7d9ca6 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_pattern_allow([PKG_CHECK_EXISTS])
 
-AC_INIT([rtorrent], [0.9.8], [sundell.software@gmail.com])
+AC_INIT([rtorrent], [0.10.0], [sundell.software@gmail.com])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([scripts])
@@ -49,7 +49,7 @@ fi
 
 PKG_CHECK_MODULES([LIBCURL], [libcurl],, [LIBCURL_CHECK_CONFIG])
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
-PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.13.8])
+PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.14.0])
 
 AC_LANG_PUSH(C++)
 TORRENT_WITH_XMLRPC_C
diff --git a/test/Makefile.am b/test/Makefile.am
index 66ad1d4f..7ae9ca8e 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -4,6 +4,7 @@ check_PROGRAMS = $(TESTS)
 rtorrentTest_LDADD = ../src/libsub_root.a
 
 rtorrentTest_SOURCES = \
+	helpers/assert.h \
 	rpc/command_test.cc \
 	rpc/command_test.h \
 	rpc/command_map_test.cc \