diff --git a/make_gcov.sh b/make_gcov.sh
index 907c1ebd48..4d5f63f1dd 100644
--- a/make_gcov.sh
+++ b/make_gcov.sh
@@ -16,16 +16,16 @@
 
 # clean up udev dir
 clean_udev () {
-	find -name "*.da" -exec rm -f "{}" \;
-	find -name "*.bb" -exec rm -f "{}" \;
-	find -name "*.bbg" -exec rm -f "{}" \;
+	find -name "*.gcno" -exec rm -f "{}" \;
+	find -name "*.gcda" -exec rm -f "{}" \;
 	find -name "*.gcov" -exec rm -f "{}" \;
+	rm -f udev_gcov.txt
 	make clean
 }
 
 PWD=`pwd`
 GCCINCDIR=`gcc -print-search-dirs | sed -ne "s/install: \(.*\)/\1include/gp"`
-LIBSYSFS="-I$PWD/libsysfs"
+LIBSYSFS="-I$PWD/libsysfs/sysfs -I$PWD/libsysfs"
 WARNINGS="-Wall -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations"
 GCC="-I$GCCINCDIR"
 USE_LOG="-DLOG"
@@ -50,4 +50,4 @@ done
 
 clean_udev
 
-make $* CFLAGS="$WARNINGS $GCOV_FLAGS $USE_LOG $DEBUG $GCC $LIBSYSFS"
+make $* CFLAGS="$WARNINGS $GCOV_FLAGS $USE_LOG $DEBUG $GCC $LIBSYSFS" LDFLAGS="-Wl,-warn-common -fprofile-arcs"
diff --git a/run_gcov.sh b/run_gcov.sh
index 4fe936199f..ad6a62b130 100644
--- a/run_gcov.sh
+++ b/run_gcov.sh
@@ -23,12 +23,12 @@ echo > udev_gcov.txt
 echo "CODE COVERAGE ANALYSIS FOR UDEV" >> udev_gcov.txt
 echo  >> udev_gcov.txt
 
-for file in `find -maxdepth 1 -name "*.bb"`; do
-	name=`basename $file .bb`
+for file in `find -maxdepth 1 -name "*.gcno"`; do
+	name=`basename $file .gcno`
 	echo "################" >> udev_gcov.txt
 	echo "$name.c" >> udev_gcov.txt
 	echo "################" >> udev_gcov.txt
-	if [ -e "$name.da" ]; then
+	if [ -e "$name.gcda" ]; then
 		gcov -l "$name.c" >> udev_gcov.txt 2>&1
 	else
 		echo "code for $name.c was never executed" >> udev_gcov.txt 2>&1