diff --git a/src/commitpkg.in b/src/commitpkg.in
index 108fe81..f979d61 100644
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -7,6 +7,7 @@ _DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
 source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
 
 source /usr/share/makepkg/util/util.sh
+source /usr/share/makepkg/srcinfo.sh
 
 
 check_pkgbuild_validity() {
@@ -177,13 +178,11 @@ done
 # check for PKGBUILD standards
 check_pkgbuild_validity
 
-# auto generate .SRCINFO if present
-if [[ -f .SRCINFO ]]; then
-	stat_busy 'Generating .SRCINFO'
-	makepkg --printsrcinfo > .SRCINFO
-	git add .SRCINFO
-	stat_done
-fi
+# auto generate .SRCINFO
+stat_busy 'Generating .SRCINFO'
+write_srcinfo_content > .SRCINFO
+git add --force .SRCINFO
+stat_done
 
 if [[ -n $(git status --porcelain --untracked-files=no) ]]; then
 	stat_busy 'Staging files'