diff --git a/debian/control b/debian/control
index 9025f52d..3e0a39c5 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Package: ngcp-ngcpcfg
 Architecture: all
 Depends: etckeeper,
          file,
-         git-core,
+         git (>= 1:1.7.2.5-3~),
          libdata-validate-ip-perl,
          libdbd-mysql-perl,
          libdbi-perl,
diff --git a/scripts/services b/scripts/services
index b84ed3d2..f9356177 100755
--- a/scripts/services
+++ b/scripts/services
@@ -42,18 +42,7 @@ unifyer() {
   fi
 }
 
-# NOTES:
-# * 'git ls-files -o' also shows ignored files
-# * 'git status --porcelain |grep '^?? ' not available in git 1.5
-
-# The 'git diff' command fixes a strange race condition where 'git diff-index'
-# lists *all* generated file(s) where the time stamp differs, resulting in a
-# list of *all* generated files (which is not what we want).
-# After running 'git diff' the following 'git diff-index ...' command lists
-# only the modified files as we want and need it. See BTS #211 for bugreport.
-git diff &>/dev/null
-
-for file in $(git diff-index --name-only HEAD) ; do
+for file in $(git status --porcelain | sed 's/^...//') ; do
   if [ -r "$file" ] && [ -r "${SERVICES_POOL}/${file}".services ] ; then
     log_debug "unifyer ${SERVICES_POOL}/${file}.services"
     unifyer "${SERVICES_POOL}/${file}".services