diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c22a6fd..65b32df0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -34,6 +34,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 * generate-ldif: Correct generated entries for php-fpm in containers
 * redis: Remount /usr with RW before adding nagios plugin
 * postfix: Do not send mails through milters a second time after amavis (in packmail)
+* etc-git : Remount /usr in rw for git gc in in /usr/share/scripts/
 
 ### Removed
 
diff --git a/etc-git/files/etc-git-optimize b/etc-git/files/etc-git-optimize
index 3d4932ee..56967e8f 100644
--- a/etc-git/files/etc-git-optimize
+++ b/etc-git/files/etc-git-optimize
@@ -6,6 +6,12 @@ repositories="/etc /etc/bind/ /usr/share/scripts"
 
 for repository in ${repositories}; do
     if [ -d "${repository}/.git" ]; then
+        if [ ${repository} = "/usr/share/scripts" ]; then
+            mount -o remount,rw /usr
+        fi
         git --git-dir="${repository}/.git" gc --quiet
+        if [ ${repository} = "/usr/share/scripts" ]; then
+            mount -o remount /usr
+        fi
     fi
 done