diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml b/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
index 14e4d5deac..2c3329e47a 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/dev-support/findbugsExcludeFile.xml
@@ -15,9 +15,9 @@
       <Class name="org.apache.hadoop.hdfs.protocol.SnapshottableDirectoryStatus"/>
       <Class name="org.apache.hadoop.hdfs.server.protocol.DatanodeStorageReport"/>
       <Class name="org.apache.hadoop.hdfs.protocol.datatransfer.sasl.SaslResponseWithNegotiatedCipherOption"/>
-      <Class name="org.apache.hadoop.hdfs.DFSPacket”/>
-      <Class name="org.apache.hadoop.hdfs.protocol.LocatedStripedBlock”/>
-      <Class name=“org.apache.hadoop.hdfs.util.StripedBlockUtil$ChunkByteArray”/>
+      <Class name="org.apache.hadoop.hdfs.DFSPacket"/>
+      <Class name="org.apache.hadoop.hdfs.protocol.LocatedStripedBlock"/>
+      <Class name="org.apache.hadoop.hdfs.util.StripedBlockUtil$ChunkByteArray"/>
     </Or>
     <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2" />
   </Match>
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index 95351a2298..6e6ca96f8b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -359,6 +359,9 @@ Trunk (Unreleased)
     HDFS-9204. DatanodeDescriptor#PendingReplicationWithoutTargets is wrongly
     calculated. (Mingliang Liu via jing9)
 
+    HDFS-9217. Fix broken findbugsExcludeFile.xml for hadoop-hdfs-client module.
+    (Mingliang Liu via aajisaka)
+
     BREAKDOWN OF HDFS-7285 SUBTASKS AND RELATED JIRAS
 
       HDFS-7347. Configurable erasure coding policy for individual files and