diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6031df39f7808f18bd5e63dc1e114cf028a8514d..5182bb7e77d26063aec7b44d79251a40d2051a52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,12 +10,12 @@ variables:
 # - if VERSION was already set (when manually running a pipeline), use it
 # - if we are in the official Dynare repository:
 #   + if on a tag: use the tag
-#   + if on master: use 4.8-unstable-$TIMESTAMP-$COMMIT
+#   + if on master: use 6-unstable-$TIMESTAMP-$COMMIT
 #   + on another branch: use $BRANCH-$TIMESTAMP-$COMMIT
 # - if in a personal repository: use $USER-$TIMESTAMP-$COMMIT
 before_script:
   - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ -n $CI_COMMIT_TAG ]] && export VERSION=$CI_COMMIT_TAG'
-  - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ $CI_COMMIT_REF_NAME == master ]] && export VERSION=4.8-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
+  - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && [[ $CI_COMMIT_REF_NAME == master ]] && export VERSION=6-unstable-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
   - '[[ -z $VERSION ]] && [[ $CI_PROJECT_NAMESPACE == Dynare ]] && export VERSION=$CI_COMMIT_REF_NAME-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
   - '[[ -z $VERSION ]] && export VERSION=$CI_PROJECT_NAMESPACE-$(date +%F-%H%M)-$CI_COMMIT_SHORT_SHA'
 
diff --git a/configure.ac b/configure.ac
index edcedb260f23fff0d544f6da339c7aa938afdc76..6073dac19fe0e48d754e25ee43354d5969711125 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.62])
-AC_INIT([dynare], [4.8-unstable])
+AC_INIT([dynare], [6-unstable])
 AC_CONFIG_SRCDIR([preprocessor/src/DynareMain.cc])
 AM_INIT_AUTOMAKE([1.11 -Wall -Wno-portability foreign no-dist-gzip dist-xz tar-pax])
 
diff --git a/mex/build/matlab/configure.ac b/mex/build/matlab/configure.ac
index 5a877ae473333e81fd5bea33a4be3e4ed581b90c..5cd8a9b1312c4622d02cc06ed7f78ccb876b0df1 100644
--- a/mex/build/matlab/configure.ac
+++ b/mex/build/matlab/configure.ac
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.62])
-AC_INIT([dynare], [4.8-unstable])
+AC_INIT([dynare], [6-unstable])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
 
diff --git a/mex/build/octave/configure.ac b/mex/build/octave/configure.ac
index cf9a0adcb55f1ea5d31b4d73b553c64353f1112a..0133f623c0fec82f6861f18ea45aeac82ec059f2 100644
--- a/mex/build/octave/configure.ac
+++ b/mex/build/octave/configure.ac
@@ -18,7 +18,7 @@ dnl You should have received a copy of the GNU General Public License
 dnl along with Dynare.  If not, see <https://www.gnu.org/licenses/>.
 
 AC_PREREQ([2.62])
-AC_INIT([dynare], [4.8-unstable])
+AC_INIT([dynare], [6-unstable])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign])
 
diff --git a/preprocessor b/preprocessor
index c0ea8d72038cd6c57e48aca26d2d29866848ae0a..be316b3dec67baea8f1a5f584ba6326f7816eede 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit c0ea8d72038cd6c57e48aca26d2d29866848ae0a
+Subproject commit be316b3dec67baea8f1a5f584ba6326f7816eede