diff --git a/tools/build/onos-validate-change-version b/tools/build/onos-validate-change-version
index 1bf7645..d8f917f 100755
--- a/tools/build/onos-validate-change-version
+++ b/tools/build/onos-validate-change-version
@@ -5,12 +5,16 @@
 
 [ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1
 
-aux=/tmp/pom-$$.log
+aux=$(mktemp)
 trap "rm -f $aux 2>/dev/null" EXIT
 
+cd $ONOS_ROOT
 grep -r SNAPSHOT . | \
-    grep -v -f $(dirname $0)/onos-validate-change-version.excludes > $aux
+    egrep -v -f $ONOS_ROOT/tools/build/onos-validate-change-version.excludes >$aux
 
-[ ! -s $aux ] && echo "There are files containing SNAPSHOT references:" && \
-    cat $aux && exit 1
+if [ -s $aux ]; then
+    echo "There are files containing SNAPSHOT references:"
+    cat $aux
+    exit 1
+fi
 exit 0
\ No newline at end of file
diff --git a/tools/build/onos-validate-change-version.excludes b/tools/build/onos-validate-change-version.excludes
index 8650872..32fb1e8 100755
--- a/tools/build/onos-validate-change-version.excludes
+++ b/tools/build/onos-validate-change-version.excludes
@@ -1,24 +1,21 @@
 \./build.log
 \./.git
 \./target/
+\./tools/build/onos-validate-change-version
 \./tools/build/onos-change-version
 \./tools/build/onos-release
 \./tools/build/onos-snapshot
-
 \./tools/package/archetypes/.*/archetype\.properties
 \./tools/package/maven-plugin/pom.xml
 \./tools/build/conf/pom.xml
-
 \./web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
 \./core/api/src/test/java/org/onosproject/VersionTest.java
-
 \./tools/package/yangtools/pom.xml
 \./tools/package/yangtools/src/main/resources/pom-template.xml
 \./utils/yangutils/pom.xml
-
 \./apps/openstackrouting/pom.xml
 \./apps/openstackswitching/pom.xml
 \./apps/vrouter/pom.xml
-
 \./protocols/ospf/
-\./protocols/snmp/
\ No newline at end of file
+\./protocols/snmp/
+\./providers/snmp/
\ No newline at end of file