diff --git a/.gitignore b/.gitignore
index 3c1fe7c..087f44d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .eqc-info
 .eunit/
 .qc/
+.rebar/
 deps/
 ebin/
 erl_crash.dump
diff --git a/.travis.yml b/.travis.yml
index 835ee4b..2b48e90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,6 @@
 language: erlang
 script: "make clean compile xref test"
 otp_release:
+  - 17.0-rc1
   - R16B03-1
   - R15B03
diff --git a/Makefile b/Makefile
index e38f2a3..a3d040d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,8 @@
 
 REBAR?=./rebar
 
-.PHONY: all clean deps compile xref doc test eunit eqc proper triq \
-	compile-for-eunit compile-for-eqc compile-for-proper compile-for-triq
+.PHONY: all clean deps compile xref doc test eunit eqc proper \
+	compile-for-eunit compile-for-eqc compile-for-proper
 
 all: compile
 
@@ -10,7 +10,7 @@ deps:
 	$(REBAR) get-deps
 
 clean:
-	$(REBAR) clean
+	$(REBAR) clean -r
 
 compile:
 	$(REBAR) compile
@@ -34,9 +34,6 @@ eqc: compile-for-eqc
 proper: compile-for-proper
 	@echo "rebar does not implement a 'proper' command" && false
 
-triq: compile-for-triq
-	$(REBAR) triq skip_deps=true
-
 compile-for-eunit:
 	$(REBAR) compile eunit compile_only=true
 
@@ -45,6 +42,3 @@ compile-for-eqc:
 
 compile-for-proper:
 	$(REBAR) -D QC -D QC_PROPER compile eqc compile_only=true
-
-compile-for-triq:
-	$(REBAR) -D QC -D QC_TRIQ compile triq compile_only=true
diff --git a/rebar b/rebar
index 8caabf0..0b5ba9b 100755
Binary files a/rebar and b/rebar differ
diff --git a/rebar.config b/rebar.config
index 82c0e61..c802c9b 100644
--- a/rebar.config
+++ b/rebar.config
@@ -2,8 +2,10 @@
 
 {require_min_otp_vsn, "R15"}.
 
-{erl_opts, [warnings_as_errors, {platform_define, "R15A", 'old_callbacks'}]}.
+{erl_opts, [warnings_as_errors, warn_shadow_vars, warn_obsolete_guard,
+            {platform_define, "R15A", 'old_callbacks'}]}.
 
-{xref_checks, [undefined_function_calls, deprecated_function_calls]}.
+{xref_checks, [undefined_function_calls, undefined_functions,
+               deprecated_function_calls, deprecated_functions]}.
 
-{deps, [{qc, "", {git, "git://github.com/norton/qc.git"}}]}.
+{deps, [{qc, "", {git, "git://github.com/norton/qc.git", {branch, "master"}}}]}.