diff --git a/.hooks/pre-commit b/.hooks/pre-commit
index 7e9d8ec35..eb294fc1d 100755
--- a/.hooks/pre-commit
+++ b/.hooks/pre-commit
@@ -3,7 +3,7 @@
 # set -x
 
 lines_before=`git stash list | wc -l`
-git stash push --keep-index -q
+git stash push --keep-index --include-untracked -q --message "You should never see this commit message. If you do, please repair your git setup manully!"
 lines_after=`git stash list | wc -l`
 
 cleanup() {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d810f9fda..3e6602936 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
   [#952](https://github.com/nextcloud/cookbook/pull/952) @christianlupus
 - Redirect to login in case of logged out user
   [#956](https://github.com/nextcloud/cookbook/pull/956) @christianlupus
+- Fix problem with git pre-commit hook dropping files unintentionally
+  [#974](https://github.com/nextcloud/cookbook/pull/974) @christianlupus
 
 ### Documentation
 - Corrected some spelling issues