diff --git a/bin/frama-c-script b/bin/frama-c-script
index 2c0b0dec11588ad3285c314393a0941c36220165..f4ba2342d0e2907002113f7497041df36fb4d69b 100755
--- a/bin/frama-c-script
+++ b/bin/frama-c-script
@@ -88,7 +88,7 @@ DIR="$( cd "$( dirname "$0" )" && pwd )"
 # All scripts called by frama-c-script may rely on FRAMAC_BIN pointing to the
 # directory containing frama-c, frama-c-config and frama-c-script.
 export FRAMAC_BIN="$DIR"
-FRAMAC_SHARE=$("${DIR}/frama-c-config" -share)
+FRAMAC_SHARE=$("${DIR}/frama-c-config" -print-share-path)
 if [ -z ${FRAMAC_SESSION+x} ]; then
     FRAMAC_SESSION="./.frama-c";
 fi
diff --git a/doc/userman/user-start.tex b/doc/userman/user-start.tex
index dc592cf246d3acbba28e883b9328683379db7c27..ef3dd8f71b3110428d896da94b838e8cc0aa2ac5 100644
--- a/doc/userman/user-start.tex
+++ b/doc/userman/user-start.tex
@@ -257,7 +257,7 @@ content of the file to \texttt{\~{}/.bash\_completion}
 \item You can \texttt{source} the file, e.g. from your \texttt{.bashrc} with
 the following command:
 \begin{verbatim}
-source $(frama-c-config -share)/autocomplete_frama-c || true
+source $(frama-c-config -print-share-path)/autocomplete_frama-c || true
 \end{verbatim}
 \end{itemize}
 
diff --git a/share/analysis-scripts/template.mk b/share/analysis-scripts/template.mk
index 114d2cd6f80d6b624ece1a7f0478979eeac81036..edeb8cbd3b1106c5eb1f3aad2fe03285e70ae8cc 100644
--- a/share/analysis-scripts/template.mk
+++ b/share/analysis-scripts/template.mk
@@ -7,7 +7,7 @@
                  # an optional include, unnecessary if frama-c is in the PATH.
 FRAMAC ?= frama-c # FRAMAC is defined in path.mk when it is included, but the
                   # user can override it in the command-line.
-include $(shell $(FRAMAC)-config -scripts)/prologue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
 # Edit below as needed. Suggested flags are optional.
@@ -39,5 +39,5 @@ main.parse: \
   main.c \
 
 ### Epilogue. Do not modify this block. #######################################
-include $(shell $(FRAMAC)-config -scripts)/epilogue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/epilogue.mk
 ###############################################################################
diff --git a/tests/fc_script/oracle/GNUmakefile b/tests/fc_script/oracle/GNUmakefile
index 5b9a464e26fd809740a93a417ee458e204eb115c..e33adeea38d003482232cf4a137db198f89e7ee6 100644
--- a/tests/fc_script/oracle/GNUmakefile
+++ b/tests/fc_script/oracle/GNUmakefile
@@ -7,7 +7,7 @@
                  # an optional include, unnecessary if frama-c is in the PATH.
 FRAMAC ?= frama-c # FRAMAC is defined in path.mk when it is included, but the
                   # user can override it in the command-line.
-include $(shell $(FRAMAC)-config -scripts)/prologue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/prologue.mk
 ###############################################################################
 
 # Edit below as needed. Suggested flags are optional.
@@ -46,5 +46,5 @@ fc_script_main.parse: \
   ../main3.c \
 
 ### Epilogue. Do not modify this block. #######################################
-include $(shell $(FRAMAC)-config -scripts)/epilogue.mk
+include $(shell $(FRAMAC)-config -print-share-path)/analysis-scripts/epilogue.mk
 ###############################################################################