diff --git a/CHANGES.txt b/CHANGES.txt
index 306ee00460..56b3a9d688 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1053,6 +1053,9 @@ Release 0.21.0 - Unreleased
BUG FIXES
+ HADOOP-6790. Instrumented (Herriot) build uses too wide mask to include
+ aspect files. (Konstantin Boudnik)
+
HADOOP-6860. 'compile-fault-inject' should never be called directly.
(Konstantin Boudnik)
diff --git a/src/test/aop/build/aop.xml b/src/test/aop/build/aop.xml
index 2458513c41..d73956e16e 100644
--- a/src/test/aop/build/aop.xml
+++ b/src/test/aop/build/aop.xml
@@ -63,7 +63,7 @@
+ src.dir="${test.src.dir}/system/java;${test.src.dir}/system/aop">