diff --git a/static/scripts/grml-config.sh b/static/scripts/grml-config.sh
index 03baa42c..b30bd110 100644
--- a/static/scripts/grml-config.sh
+++ b/static/scripts/grml-config.sh
@@ -5,22 +5,30 @@ set -e
 # IMPORTANT: please note that you might override existing
 # configuration files in the current working directory!
 if command -v wget >/dev/null 2>&1 ; then
-  wget -O .screenrc     https://git.grml.org/f/grml-etc-core/etc/grml/screenrc_generic
-  wget -O .tmux.conf    https://git.grml.org/f/grml-etc-core/etc/tmux.conf
-  wget -O .vimrc        https://git.grml.org/f/grml-etc-core/etc/vim/vimrc
-  wget -O .zshrc        https://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
-  wget -O .zshenv       https://git.grml.org/f/grml-etc-core/etc/zsh/zshenv
+  wget -O .screenrc   https://grml.org/console/screenrc
+  wget -O .tmux.conf  https://grml.org/console/tmux.conf
+  wget -O .vimrc      https://grml.org/console/vimrc
+  wget -O .zshrc      https://grml.org/console/zshrc
+  wget -O .zshenv     https://grml.org/console/zshenv
   # optional:
-  # wget -O .zshrc.local https://git.grml.org/f/grml-etc-core/etc/skel/.zshrc
+  # wget -O .zshrc.local https://grml.org/console/zshrc.local
 elif command -v curl >/dev/null 2>&1 ; then
-  curl -L -o .screenrc   https://git.grml.org/f/grml-etc-core/etc/grml/screenrc_generic
-  curl -L -o .tmux.conf  https://git.grml.org/f/grml-etc-core/etc/tmux.conf
-  curl -L -o .vimrc      https://git.grml.org/f/grml-etc-core/etc/vim/vimrc
-  curl -L -o .zshrc      https://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
-  curl -L -o .zshenv     https://git.grml.org/f/grml-etc-core/etc/zsh/zshenv
+  curl -L -o .screenrc   https://grml.org/console/screenrc
+  curl -L -o .tmux.conf  https://grml.org/console/tmux.conf
+  curl -L -o .vimrc      https://grml.org/console/vimrc
+  curl -L -o .zshrc      https://grml.org/console/zshrc
+  curl -L -o .zshenv     https://grml.org/console/zshenv
   # optional:
-  # curl -L -o .zshrc.local  https://git.grml.org/f/grml-etc-core/etc/skel/.zshrc
+  # wget -O .zshrc.local https://grml.org/console/zshrc.local
+elif command -v fetch >/dev/null 2>&1 ; then
+  fetch -o .screenrc   https://grml.org/console/screenrc
+  fetch -o .tmux.conf  https://grml.org/console/tmux.conf
+  fetch -o .vimrc      https://grml.org/console/vimrc
+  fetch -o .zshrc      https://grml.org/console/zshrc
+  fetch -o .zshenv     https://grml.org/console/zshenv
+  # optional:
+  # fetch -o .zshrc.local https://grml.org/console/zshrc.local
 else
-  echo 'Error: neither wget nor curl available for retrieving configuration files.' >&2
+  echo 'Error: neither wget, curl not fetch  available for retrieving configuration files.' >&2
   exit 1
 fi
diff --git a/static/zsh-pony/index.html b/static/zsh-pony/index.html
index 85dbabc4..eb47cd8d 100644
--- a/static/zsh-pony/index.html
+++ b/static/zsh-pony/index.html
@@ -198,8 +198,7 @@ <h2 id="sec-2"><span class="section-number-2">2</span> Grml-zshrc </h2>
 </p>
 
 
-<pre class="example">% wget -O .zshrc        https://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
-</pre>
+<pre class="example">% wget -O .zshrc        https://grml.org/console/zshrc</pre>
 
 
 </div>
diff --git a/static/zsh/grmlzshrc.html b/static/zsh/grmlzshrc.html
index a38ab645..40df66bc 100644
--- a/static/zsh/grmlzshrc.html
+++ b/static/zsh/grmlzshrc.html
@@ -1572,7 +1572,7 @@ <h1>INSTALLATION ON NON-DEBIAN SYSTEMS</h1>
 </p>
 
 <pre>
-% wget -O .zshrc https://git.grml.org/f/grml-etc-core/etc/zsh/zshrc
+% wget -O .zshrc https://grml.org/console/zshrc
 </pre>
 
 <p>
@@ -1580,7 +1580,7 @@ <h1>INSTALLATION ON NON-DEBIAN SYSTEMS</h1>
 your <strong>$fpath</strong>), you can browse and download them at:
 </p>
 <p>
-<a href="https://git.grml.org/?p=grml-etc-core.git;a=tree;f=usr_share_grml/zsh;hb=HEAD">https://git.grml.org/?p=grml-etc-core.git;a=tree;f=usr_share_grml/zsh;hb=HEAD</a>
+<a href="https://github.com/grml/grml-etc-core/tree/master/usr_share_grml/zsh">https://github.com/grml/grml-etc-core/tree/master/usr_share_grml/zsh</a>
 </p>
 
 </section>
@@ -1731,12 +1731,12 @@ <h1>CONTRIBUTING</h1>
 
 <p>
 If you want to help to improve grml's zsh setup, clone the grml-etc-core
-repository from git.grml.org:
+repository from https://github.com/grml/grml-etc-core:
 \
 </p>
 
 <pre>
-% git clone git://git.grml.org/grml-etc-core.git
+% git clone https://github.com/grml/grml-etc-core
 </pre>
 
 <p>