diff --git a/README.md b/README.md
index d93bdab..acbea62 100644
--- a/README.md
+++ b/README.md
@@ -11,14 +11,19 @@ Quickstart
 ----
 
 The following commands download the current stable version of the installer and
-then install the latest deal.II release and common dependencies:
+then install the latest deal.II development version and common dependencies from
+this forked repository:
 
 ```bash
-  git clone https://github.com/dealii/candi.git
+  git clone https://github.com/chaos-polymtl/candi.git
   cd candi
   ./candi.sh
 ```
 
+To change the version of deal.II installed, change the value of the 
+`DEAL_II_VERSION` variable in `candi.cfg` (line 97) to your desired stable 
+release (e.g. `v9.5.2`).
+
 Follow the instructions on the screen
 (you can abort the process by pressing < CTRL > + C)
 
@@ -50,12 +55,12 @@ Ubuntu distribution on Windows 10 you can follow the
 [Microsoft Documentation](https://docs.microsoft.com/en-us/windows/wsl/install-win10).
 
 Within the Ubuntu terminal application, upgrade Ubuntu first, then
-clone this repository and run candi
+clone this forked repository and run candi
 
 ```bash
   sudo apt-get update
   sudo apt-get upgrade
-  git clone https://github.com/dealii/candi.git
+  git clone https://github.com/chaos-polymtl/candi.git
   cd candi
   ./candi.sh
 ```
diff --git a/candi.cfg b/candi.cfg
index 119d5dc..304dcb4 100644
--- a/candi.cfg
+++ b/candi.cfg
@@ -4,7 +4,7 @@
 PROJECT=deal.II-toolchain
 
 # Option {ON|OFF}: Use fresh build directory by remove existing ones?
-CLEAN_BUILD=OFF
+CLEAN_BUILD=ON
 
 #########################################################################
 
@@ -62,7 +62,7 @@ PACKAGES="load:dealii-prepare"
 #PACKAGES="${PACKAGES} once:git"
 #PACKAGES="${PACKAGES} once:cmake"
 #PACKAGES="${PACKAGES} once:boost"
-#PACKAGES="${PACKAGES} once:numdiff"
+PACKAGES="${PACKAGES} once:numdiff"
 #PACKAGES="${PACKAGES} once:openblas"
 #PACKAGES="${PACKAGES} once:scalapack"
 
@@ -80,28 +80,28 @@ PACKAGES="load:dealii-prepare"
 #PACKAGES="${PACKAGES} once:mumps"
 PACKAGES="${PACKAGES} once:opencascade"
 PACKAGES="${PACKAGES} once:parmetis"
-PACKAGES="${PACKAGES} once:sundials"
+#PACKAGES="${PACKAGES} once:sundials"
 #PACKAGES="${PACKAGES} once:superlu_dist"
-PACKAGES="${PACKAGES} once:hdf5"
+#PACKAGES="${PACKAGES} once:hdf5"
 #PACKAGES="${PACKAGES} once:netcdf"
 PACKAGES="${PACKAGES} once:p4est"
 PACKAGES="${PACKAGES} once:trilinos"
-PACKAGES="${PACKAGES} once:petsc"
-PACKAGES="${PACKAGES} once:slepc"
-PACKAGES="${PACKAGES} once:symengine"
+#PACKAGES="${PACKAGES} once:petsc"
+#PACKAGES="${PACKAGES} once:slepc"
+#PACKAGES="${PACKAGES} once:symengine"
 PACKAGES="${PACKAGES} dealii"
 
 #########################################################################
 
 # Install the following deal.II version (choose master, v9.3.0, v9.2.0, ...)
-DEAL_II_VERSION=v9.5.2
+DEAL_II_VERSION=master
 
 #########################################################################
 
 # If you want to use Trilinos, decide which major version to use
-TRILINOS_MAJOR_VERSION=AUTO
+#TRILINOS_MAJOR_VERSION=AUTO
 #TRILINOS_MAJOR_VERSION=14
-#TRILINOS_MAJOR_VERSION=13
+TRILINOS_MAJOR_VERSION=13
 #TRILINOS_MAJOR_VERSION=12
 #TRILINOS_MAJOR_VERSION=11
 
diff --git a/deal.II-toolchain/packages/p4est.package b/deal.II-toolchain/packages/p4est.package
index 2d892c8..f19f15c 100644
--- a/deal.II-toolchain/packages/p4est.package
+++ b/deal.II-toolchain/packages/p4est.package
@@ -6,10 +6,13 @@
 #VERSION=2.0;CHECKSUM=1b7440a78a28ebf713361acfea70ee78
 #VERSION=2.2;CHECKSUM=6943949a6678589ebf1686ee7bad7ea1
 
-VERSION=2.3.2
-CHECKSUM=076df9e5578e0e7fcfbe12e1a0b080104001f8c986ab1d5a69ec2220050df8e6
-CHECKSUM="${CHECKSUM} b41c8ef29ca88be0ae73116dca8afed2743fb2ef"
-CHECKSUM="${CHECKSUM} 0ea6e4806b6950ad64e62a5607bfabbb"
+#VERSION=2.3.2
+#CHECKSUM=076df9e5578e0e7fcfbe12e1a0b080104001f8c986ab1d5a69ec2220050df8e6
+#CHECKSUM="${CHECKSUM} b41c8ef29ca88be0ae73116dca8afed2743fb2ef"
+#CHECKSUM="${CHECKSUM} 0ea6e4806b6950ad64e62a5607bfabbb"
+
+VERSION=2.3.6
+CHECKSUM=4b35d9cc374e3b05cd29c552070940124f04af8f8e5e01ff046e39833de5e153
 
 NAME=p4est-${VERSION}
 PACKING=.tar.gz