diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 53dec4ae..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-language: cpp
-
-env:
-  global:
-    - MAKEFLAGS="-j 12"
-
-matrix:
-  include:
-  - compiler: clang
-    env: COMPILER=clang++ SKIP_CHECK=true
-  - compiler: clang
-    env: COMPILER=clang++
-    addons:
-      apt:
-        packages:
-        - libcppunit-dev
-  - compiler: clang
-    env: COMPILER=clang++-3.6
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-precise-3.6
-        packages:
-        - clang-3.6
-        - libcppunit-dev
-  - compiler: clang
-    env: COMPILER=clang++-3.7
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-precise-3.7
-        packages:
-        - clang-3.7
-        - libcppunit-dev
-  - compiler: clang
-    env: COMPILER=clang++-3.8
-    addons:
-      apt:
-        sources:
-        - ubuntu-toolchain-r-test
-        - llvm-toolchain-precise-3.8
-        packages:
-        - clang-3.8
-        - libcppunit-dev
-  - compiler: gcc
-    env: COMPILER=g++-4.7 SKIP_CHECK=true
-    addons:
-      apt:
-        sources: ubuntu-toolchain-r-test
-        packages:
-        - g++-4.7
-  - compiler: gcc
-    env: COMPILER=g++-4.7
-    addons:
-      apt:
-        sources: ubuntu-toolchain-r-test
-        packages:
-        - g++-4.7
-        - libcppunit-dev
-  - compiler: gcc
-    env: COMPILER=g++-4.8
-    addons:
-      apt:
-        sources: ubuntu-toolchain-r-test
-        packages:
-        - g++-4.8
-        - libcppunit-dev
-
-# TODO: Use the same branch name if libtorrent has it.
-before_install:
- - git clone https://github.com/rakshasa/libtorrent.git
- - |
-   pushd libtorrent \
-   && (git checkout ${TRAVIS_BRANCH} || true) \
-   && ./autogen.sh \
-   && CXX="$COMPILER" ./configure --prefix=/usr \
-   && make \
-   && sudo make install \
-   && popd
-
-script:
-- ./autogen.sh && CXX="$COMPILER" ./configure && make
-- if [ ! $SKIP_CHECK ]; then make check; fi
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index e69de29b..00000000
diff --git a/configure.ac b/configure.ac
index c8921c8d..b5e8d2b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 m4_pattern_allow([PKG_CHECK_EXISTS])
 
-AC_INIT([rtorrent],[0.15.4],[sundell.software@gmail.com])
+AC_INIT([rtorrent],[0.16.0],[sundell.software@gmail.com])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIRS([scripts])
@@ -11,8 +11,7 @@ LT_INIT
 
 AC_PROG_CXX
 
-# Incremented after 0.15.4 release.
-AC_DEFINE([API_VERSION], [15], [api version])
+AC_DEFINE([API_VERSION], [16], [api version])
 
 # Filter out unwanted flags added by autoconf on some systems, e.g. MacOS.
 TORRENT_REMOVE_UNWANTED(CXX, $CXX, -std=c++11 -std=gnu++11)
@@ -49,7 +48,7 @@ if test "x$ax_cv_ncursesw" != xyes && test "x$ax_cv_ncurses" != xyes; then
 fi
 
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
-PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.15.4])
+PKG_CHECK_MODULES([DEPENDENCIES], [libtorrent >= 0.16.0])
 
 AC_LANG_PUSH(C++)
 TORRENT_WITH_XMLRPC_C
diff --git a/src/Makefile.am b/src/Makefile.am
index 6b2f1c9a..01bca664 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -13,7 +13,6 @@ libsub_root_a_SOURCES = \
 	core/download_factory.h \
 	core/download_list.cc \
 	core/download_list.h \
-	core/download_slot_map.h \
 	core/download_store.cc \
 	core/download_store.h \
 	core/http_queue.cc \