diff --git a/hcl/hclsyntax/scan_tokens_test.go b/hcl/hclsyntax/scan_tokens_test.go
index 5c9f159..b851414 100644
--- a/hcl/hclsyntax/scan_tokens_test.go
+++ b/hcl/hclsyntax/scan_tokens_test.go
@@ -1012,39 +1012,39 @@ EOT
 					Bytes: []byte("<<EOT\r\n"),
 					Range: hcl.Range{
 						Start: hcl.Pos{Byte: 0, Line: 1, Column: 1},
-						End:   hcl.Pos{Byte: 7, Line: 1, Column: 7},
+						End:   hcl.Pos{Byte: 7, Line: 2, Column: 1},
 					},
 				},
 				{
 					Type:  TokenStringLit,
 					Bytes: []byte("hello world\r\n"),
 					Range: hcl.Range{
-						Start: hcl.Pos{Byte: 7, Line: 1, Column: 7},
-						End:   hcl.Pos{Byte: 20, Line: 1, Column: 19},
+						Start: hcl.Pos{Byte: 7, Line: 2, Column: 1},
+						End:   hcl.Pos{Byte: 20, Line: 3, Column: 1},
 					},
 				},
 				{
 					Type:  TokenCHeredoc,
 					Bytes: []byte("EOT"),
 					Range: hcl.Range{
-						Start: hcl.Pos{Byte: 20, Line: 1, Column: 19},
-						End:   hcl.Pos{Byte: 23, Line: 1, Column: 22},
+						Start: hcl.Pos{Byte: 20, Line: 3, Column: 1},
+						End:   hcl.Pos{Byte: 23, Line: 3, Column: 4},
 					},
 				},
 				{
 					Type:  TokenNewline,
 					Bytes: []byte("\r\n"),
 					Range: hcl.Range{
-						Start: hcl.Pos{Byte: 23, Line: 1, Column: 22},
-						End:   hcl.Pos{Byte: 25, Line: 1, Column: 23},
+						Start: hcl.Pos{Byte: 23, Line: 3, Column: 4},
+						End:   hcl.Pos{Byte: 25, Line: 4, Column: 1},
 					},
 				},
 				{
 					Type:  TokenEOF,
 					Bytes: []byte{},
 					Range: hcl.Range{
-						Start: hcl.Pos{Byte: 25, Line: 1, Column: 23},
-						End:   hcl.Pos{Byte: 25, Line: 1, Column: 23},
+						Start: hcl.Pos{Byte: 25, Line: 4, Column: 1},
+						End:   hcl.Pos{Byte: 25, Line: 4, Column: 1},
 					},
 				},
 			},
diff --git a/hcl/hclsyntax/token.go b/hcl/hclsyntax/token.go
index 53e847d..bcaa15f 100644
--- a/hcl/hclsyntax/token.go
+++ b/hcl/hclsyntax/token.go
@@ -133,7 +133,7 @@ func (f *tokenAccum) emitToken(ty TokenType, startOfs, endOfs int) {
 	b := f.Bytes[startOfs:endOfs]
 	for len(b) > 0 {
 		advance, seq, _ := textseg.ScanGraphemeClusters(b, true)
-		if len(seq) == 1 && seq[0] == '\n' {
+		if (len(seq) == 1 && seq[0] == '\n') || (len(seq) == 2 && seq[0] == '\r' && seq[1] == '\n') {
 			end.Line++
 			end.Column = 1
 		} else {