diff --git a/clang/lib/AST/CommentLexer.cpp b/clang/lib/AST/CommentLexer.cpp
--- a/clang/lib/AST/CommentLexer.cpp
+++ b/clang/lib/AST/CommentLexer.cpp
@@ -701,7 +701,7 @@
 
   C = *BufferPtr;
   if (!isHTMLIdentifierStartingCharacter(C) &&
-      C != '=' && C != '\"' && C != '\'' && C != '>') {
+      C != '=' && C != '\"' && C != '\'' && C != '>' && C != '/') {
     State = LS_Normal;
     return;
   }
diff --git a/clang/test/Sema/warn-documentation.cpp b/clang/test/Sema/warn-documentation.cpp
--- a/clang/test/Sema/warn-documentation.cpp
+++ b/clang/test/Sema/warn-documentation.cpp
@@ -62,6 +62,21 @@
 /// <br></br>
 int test_html11(int);
 
+/// Aaa bbb<img/>
+int test_html_img1(int);
+
+/// Aaa bbb<img />
+int test_html_img2(int);
+
+/// Aaa bbb<img src="">
+int test_html_img3(int);
+
+/// Aaa bbb<img src=""/>
+int test_html_img3(int);
+
+/// Aaa bbb<img src="" />
+int test_html_img4(int);
+
 /// <blockquote>Meow</blockquote>
 int test_html_nesting1(int);