diff --git a/CHANGELOG b/CHANGELOG
index 64b0e958..922a7d30 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+nnn v3.6 Nina
+2021-03-16
+
+- REPL command prompt (<kbd>Esc</kbd> or <kbd>Enter</kbd> to exit)
+- invert selection with <kbd>A</kbd>
+- option `-u` removed (always prefer selection to hovered)
+- visit start dir on <kbd>@</kbd> when start path is a file
+- exit filter mode and redraw on <kbd>^L</kbd> if no last filter
+- plugin `fzcd` now selects the chosen file (#876)
+- `ueberzug` support in plugin `preview-tui`
+- new plugin `preview-tui-ext` with extra preview support
+- clear selection after successful plugin invocation
+- add method to sync subshell `$PWD` in WIki
+- clear selection on single file deletion (#812)
+- copy between instances not working (#864)
+- plugin `togglex` to toggle exe mode of a selection (#813)
+- fix `memccpy()` buffer overlap fault on macOS (#786)
+- show `0 selected` msg on cp/mv with empty selection (#855)
+- fix frozen terminal caused by opener (#858)
+- migrate macOS CI to GitHub workflows, retire Travis
+
+-------------------------------------------------------------------------------
+
 nnn v3.5 Freddie
 2020-11-17
 
diff --git a/README.md b/README.md
index cdf163fd..9575f81a 100644
--- a/README.md
+++ b/README.md
@@ -193,4 +193,4 @@ Don't memorize! Arrows (or <kbd>h</kbd> <kbd>j</kbd> <kbd>k</kbd> <kbd>l</kbd>),
 - [Todd Yamakawa](https://github.com/toddyamakawa)
 - and other contributors
 
-Visit the [ToDo list](https://github.com/jarun/nnn/issues/781) to contribute or see the features in progress.
+Visit the [ToDo list](https://github.com/jarun/nnn/issues/881) to contribute or see the features in progress.
diff --git a/misc/haiku/nnn.rdef b/misc/haiku/nnn.rdef
index a41e4cc7..e63aaf93 100644
--- a/misc/haiku/nnn.rdef
+++ b/misc/haiku/nnn.rdef
@@ -9,10 +9,10 @@ resource app_signature "application/x-vnd.Jarun-nnn";
 
 resource app_version {
 	major  = 3,
-	middle = 5,
+	middle = 6,
 	minor  = 0,
 
-	variety = B_APPV_DEVELOPMENT,
+	variety = B_APPV_FINAL,
 	internal = 0,
 
 	short_info = "nnn",
diff --git a/misc/packagecore/packagecore.yaml b/misc/packagecore/packagecore.yaml
index 46a97fa3..df4e5743 100644
--- a/misc/packagecore/packagecore.yaml
+++ b/misc/packagecore/packagecore.yaml
@@ -79,16 +79,6 @@ packages:
     deps:
       - libncursesw6
       - readline-common
-  fedora31:
-    builddeps:
-      - make
-      - gcc
-      - pkg-config
-      - ncurses-devel
-      - readline-devel
-    deps:
-      - ncurses
-      - readline
   fedora32:
     builddeps:
       - make
@@ -99,16 +89,6 @@ packages:
     deps:
       - ncurses
       - readline
-  opensuse15.1:
-    builddeps:
-      - make
-      - gcc
-      - pkg-config
-      - readline-devel
-      - ncurses-devel
-    deps:
-      - libncurses6
-      - libreadline7
   opensuse15.2:
     builddeps:
       - make
diff --git a/nnn.1 b/nnn.1
index e07709be..74e7fada 100644
--- a/nnn.1
+++ b/nnn.1
@@ -1,4 +1,4 @@
-.Dd Nov 17, 2020
+.Dd Mar 16, 2021
 .Dt NNN 1
 .Os
 .Sh NAME
diff --git a/src/nnn.c b/src/nnn.c
index 359eca85..d2b0e879 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -126,7 +126,7 @@
 #endif
 
 /* Macro definitions */
-#define VERSION "3.5"
+#define VERSION "3.6"
 #define GENERAL_INFO "BSD 2-Clause\nhttps://github.com/jarun/nnn"
 
 #ifndef NOSSN