diff --git a/CHANGELOG b/CHANGELOG
index 09155457..ed3c965f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,39 @@
+nnn v3.3
+2020-07-14
+
+- subdir `mounts` for remote and archive mounts
+- remove mount point on successful unmount of remote/archive
+- show error and prompt user if `cp`/`mv`/`rm` operation fails
+- support absolute/relative paths in cp/mv as
+- mark current path automatically on archive/remote mount
+- mark current path automatically on target file visit in _find and list_ mode
+- option `-C` to place HW cursor on hovered for screen readers and braille displays
+- option `-u` to use selection (if available) and skip `current/sel` prompt
+- key <kbd>Alt+Esc</kbd> to clear filter prompt and redraw
+- support <kbd>Esc</kbd> to cancel remove operation
+- `gpge` & `gpgd`: encrypt and decrypt with GPG
+- `blknew`: create new files and directories in bulk
+- `preview-tui`
+  - unified to support `tmux`/`kitty`/`xterm`/`$TERMINAL`
+  - auto-determine split orientation based on terminal height and width
+  - provision to use [`scope.sh`](https://github.com/ranger/ranger/blob/master/ranger/data/scope.sh) and [`pistol`](https://github.com/doronbehar/pistol)
+- various other improvements
+- `upload`: send to Firefox Send if [`ffsend`](https://github.com/timvisee/ffsend) is found
+- `hexview`: add [`hx`](https://github.com/krpors/hx) as alternative hex viewer
+- `nuke` and `imgview`: add [`imv`](https://github.com/eXeC64/imv) as alternative image viewer
+- add find (with `fd`) and grep (with `rg`) examples in plugins doc
+- key <kbd>Esc</kbd> or left click to resend hovered file path to `NNN_FIFO`
+- show `+` instead of `s` in status bar on selection
+- <kbd>F5</kbd> removed (misfit for toggle hidden), <kbd>^S</kbd> removed (often masked, redundant)
+- handle abnormal program termination and remove NNN_PIPE and/or NNN_FIFO
+- clear selection after successful batch rename, link creation
+- make option `O_CTX8` for 8 contexts (NOT backward compatible with 4 contexts)
+- fix issue with child window resize (see #656)
+- fix issue with `NNNLVL` on macOS (see #639)
+- fix issue with restoring session with du/au enabled
+
+-------------------------------------------------------------------------------
+
 nnn v3.2
 2020-05-26
 
diff --git a/misc/haiku/Makefile b/misc/haiku/Makefile
index 7c534e71..430b3d49 100644
--- a/misc/haiku/Makefile
+++ b/misc/haiku/Makefile
@@ -52,6 +52,14 @@ ifeq ($(O_NOMOUSE),1)
 	CPPFLAGS += -DNOMOUSE
 endif
 
+ifeq ($(O_NOBATCH),1)
+	CPPFLAGS += -DNOBATCH
+endif
+
+ifeq ($(O_NOFIFO),1)
+	CPPFLAGS += -DNOFIFO
+endif
+
 ifeq ($(O_CTX8),1)
 	CPPFLAGS += -DCTX8
 endif
diff --git a/nnn.1 b/nnn.1
index 03f325b1..df7e02d9 100644
--- a/nnn.1
+++ b/nnn.1
@@ -1,4 +1,4 @@
-.Dd May 26, 2020
+.Dd Jul 14, 2020
 .Dt NNN 1
 .Os
 .Sh NAME
diff --git a/src/nnn.c b/src/nnn.c
index 42ea469b..c5ab000a 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -113,7 +113,7 @@
 #include "dbg.h"
 
 /* Macro definitions */
-#define VERSION "3.2"
+#define VERSION "3.3"
 #define GENERAL_INFO "BSD 2-Clause\nhttps://github.com/jarun/nnn"
 #define SESSIONS_VERSION 1