diff --git a/.travis.yml b/.travis.yml
index 11c47bed..304c81e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,7 @@ before_deploy:
   - sudo apt-get update -qy
   - sudo apt-get install -qy python3 python3-pip
   - sudo python3 -m pip install --upgrade pip
-  - sudo python3 -m pip install --upgrade packagecore setuptools
+  - sudo python3 -m pip install --upgrade packagecore python3-setuptools
   - packagecore -o dist/ "${TRAVIS_TAG#v}"
   - mv ../$REPO-${TRAVIS_TAG}.tar.gz dist/
 
diff --git a/CHANGELOG b/CHANGELOG
index 1b61b335..698bfad8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,33 @@
+nnn v2.3
+2019-02-19
+
+- file picker mode
+- repo of user-contributed scripts
+- substring search for filters (option `-s`)
+- version sort (option `-n`)
+- disk usage calculation abort with <kbd>^C</kbd>
+- create sym/hard link(s) to files in selection
+- archiving of selection
+- show dir symlinks along with dirs in top
+- fixed CJK character handling at prompts
+- key `N` (1 <= N <= 4) to switch to context N
+- bring back `NNN_OPENER` to specify file opener
+- env var `NNN_NOTE` and keybind <kbd>^N</kbd> for quick notes
+- handle multiple arguments in VISUAL/EDITOR
+- show the current directory being scanned in `du` mode
+- select all files (<kbd>Y</kbd>)
+- show command prompt (<kbd>^P</kbd>)
+- key <kbd>,</kbd> replaces <kbd>`</kbd> as alternative Leader Key
+- keybind for visit pinned directory is now <kbd>^B</kbd>
+- additional key <kbd>^V</kbd> to run or select custom script
+- use libreadline for command prompt
+- reduce delay on <kbd>Esc</kbd> press
+- config option to avoid unexpected behaviour on 0-byte file open (see #187)
+- rename config option `DISABLE_FILE_OPEN_ON_NAV` to `NNN_RESTRICT_NAV_OPEN`
+- keys removed - <kbd>$</kbd>, <kbd>^</kbd>, <kbd>Backspace</kbd>, <kbd>^H</kbd>, <kbd>^P</kbd>, <kbd>^M</kbd>, <kbd>^W</kbd>, <kbd>`</kbd>
+
+-------------------------------------------------------------------------------
+
 nnn v2.2
 2019-01-01
 
diff --git a/Makefile b/Makefile
index a88b28a5..fffb0eb5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 2.2
+VERSION = 2.3
 
 PREFIX ?= /usr/local
 MANPREFIX ?= $(PREFIX)/share/man
diff --git a/nnn.1 b/nnn.1
index df93891c..49a3e423 100644
--- a/nnn.1
+++ b/nnn.1
@@ -1,4 +1,4 @@
-.Dd Jan 01, 2019
+.Dd Feb 19, 2019
 .Dt NNN 1
 .Os
 .Sh NAME
diff --git a/src/nnn.c b/src/nnn.c
index 6ab73549..bcfb5ec6 100644
--- a/src/nnn.c
+++ b/src/nnn.c
@@ -161,7 +161,7 @@ disabledbg()
 #endif /* DEBUGMODE */
 
 /* Macro definitions */
-#define VERSION "2.2"
+#define VERSION "2.3"
 #define GENERAL_INFO "BSD 2-Clause\nhttps://github.com/jarun/nnn"
 
 #define LEN(x) (sizeof(x) / sizeof(*(x)))
diff --git a/scripts/user-scripts/copier.sh b/user-scripts/copier.sh
similarity index 100%
rename from scripts/user-scripts/copier.sh
rename to user-scripts/copier.sh
diff --git a/scripts/user-scripts/edit.sh b/user-scripts/edit.sh
similarity index 100%
rename from scripts/user-scripts/edit.sh
rename to user-scripts/edit.sh
diff --git a/scripts/user-scripts/fzy.sh b/user-scripts/fzy.sh
similarity index 100%
rename from scripts/user-scripts/fzy.sh
rename to user-scripts/fzy.sh
diff --git a/scripts/user-scripts/picker.sh b/user-scripts/picker.sh
similarity index 100%
rename from scripts/user-scripts/picker.sh
rename to user-scripts/picker.sh
diff --git a/scripts/user-scripts/sxiv.sh b/user-scripts/sxiv.sh
similarity index 100%
rename from scripts/user-scripts/sxiv.sh
rename to user-scripts/sxiv.sh
diff --git a/scripts/user-scripts/upgrade.sh b/user-scripts/upgrade.sh
similarity index 100%
rename from scripts/user-scripts/upgrade.sh
rename to user-scripts/upgrade.sh