diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index 4c1f11b7..8595b83e 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -16,8 +16,8 @@ jobs:
     env:
         Solution: '**/ICSharpCode.AvalonEdit.sln'
         BuildPlatform: 'Any CPU'
-        BuildVersion: '6.2.0'
-        NupkgVersion: '6.2.0-preview1'
+        BuildVersion: '6.1.1'
+        NupkgVersion: '6.1.1'
     steps:
     - uses: actions/checkout@v2
     - name: Update project version
diff --git a/ChangeLog.md b/ChangeLog.md
index 017a3be7..eceabf96 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,10 @@ Note: this changelog only lists major changes and fixes for major bugs. For a co
 tbd: AvalonEdit 6.2-preview1
 * tbd
 
+2021/03/15: AvalonEdit 6.1.1
+
+* Fix wrong implementation of attached properties
+
 2021/03/08: AvalonEdit 6.1.0
 * https://github.com/icsharpcode/AvalonEdit/compare/v6.0.1...v6.1.0