diff --git a/.gitignore b/.gitignore
index a18c1c1d391..4d7d12fe2a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 ebin/
 .eunit/
+.idea
+_build
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 29d14a383c8..be211577cb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,9 @@
-before_install:
-   - sudo apt-get update
-   - sudo apt-get install libicu-dev libmozjs-dev
-before_script: ./bootstrap && ./configure
-script: make distcheck
+dist: trusty
 language: erlang
+script: make
 otp_release:
-   - R15B02
-   - R15B01
-   - R15B
-   - R14B04
-   - R14B03
+   - 23.0
+   - 22.0
+   - 21.0
+   - 20.0
+   - 19.0
diff --git a/Makefile b/Makefile
index 7a04321d7e6..58216ec4bf7 100644
--- a/Makefile
+++ b/Makefile
@@ -3,16 +3,16 @@
 all: deps compile
 
 compile: deps
-	./rebar compile
+	./rebar3 compile
 
 deps:
-	test -d deps || ./rebar get-deps
+	test -d deps || ./rebar3 get-deps
 
 clean:
-	./rebar clean
+	./rebar3 clean
 
 distclean: clean
-	./rebar delete-deps
+	./rebar3 delete-deps
 
 DIALYZER_APPS = kernel stdlib erts sasl ssl crypto public_key
 
diff --git a/rebar b/rebar
deleted file mode 100755
index 327a40148bf..00000000000
Binary files a/rebar and /dev/null differ
diff --git a/rebar.config b/rebar.config
index ef1967f8aa2..7947ef451ff 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,9 +2,6 @@
 %% ex: ts=4 sw=4 ft=erlang noet
 
 
-%% Require at least R14B03. (couchdb requires this version or newer, and this code hasn't been tested on earlier)
-{require_min_otp_vsn, "R14B03"}.
-
 %% Ensure the ebin directory exists before we try to put files there.
 {pre_hooks, [
 	{compile, "mkdir -p ebin"}
diff --git a/rebar.lock b/rebar.lock
new file mode 100644
index 00000000000..57afcca0459
--- /dev/null
+++ b/rebar.lock
@@ -0,0 +1 @@
+[].
diff --git a/rebar3 b/rebar3
new file mode 100755
index 00000000000..54a3005e5fa
Binary files /dev/null and b/rebar3 differ