diff --git a/src/lexer.c b/src/lexer.c
index 4fed7dc..9346567 100644
--- a/src/lexer.c
+++ b/src/lexer.c
@@ -3723,6 +3723,22 @@ static tmbstr  ParseAttribute( TidyDocImpl* doc, Bool *isempty,
         if (TY_(IsWhite)(c))
             break;
 
+        if (c == '/') /* Issue #395 - potential self closing tag */
+        {
+            c = TY_(ReadChar)(doc->docIn);  /* read next */
+            if (c == '>')
+            {
+                /* got a self closing tag - put is back and continue... */
+                TY_(UngetChar)(c, doc->docIn);
+                break;
+            }
+            else
+            {
+                /* Not '/>' - put it back */
+                TY_(UngetChar)(c, doc->docIn);
+            }
+        }
+
         /* what should be done about non-namechar characters? */
         /* currently these are incorporated into the attr name */