diff --git a/COPYING b/COPYING
index 09a50d1ce53f9428fe92daed2ceea17cecf790e2..2ff764f6669855608572d02805d805ee786e96df 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2007-2020 Yoran Heling
+Copyright (c) 2007-2021 Yoran Heling
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/ChangeLog b/ChangeLog
index dcb02cb02242247d61b8c1d7cd8e5d65d0650896..c15292d713aab1ac2a6038c688c834d75758596b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+1.16 - 2021-07-02
+	- Increase width of size bar depending on terminal size (Christian Göttsche)
+	- Set/increment $NCDU_LEVEL variable when spawning a shell
+	- Indicate whether apparent size or disk usage is being displayed
+	- Display setuid, setgid and sticky bits in file flags in extended mode
+	- Fix error handling while reading --exclude-from file
+	- Improve JSON import to allow for several future extensions to the format
+	- Export link count in JSON dumps
+	- Don't export inode in JSON dumps for non-hardlinks
+
 1.15.1 - 2020-06-10
 	- (Linux) Fix build on older Linux systems (Christian Göttsche)
 	- (MacOS) Revert "Exclude firmlinks by default" behavior (until we have a better solution)
diff --git a/README b/README
index 816ccd34a367a67b843f03eed49fccc321aac72b..709e9133e520386c896a23353e6f50c4f0d05e96 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
-ncdu 1.15.1
-===========
+ncdu 1.16
+=========
 
 DESCRIPTION
 
@@ -33,7 +33,7 @@ INSTALL
 
 COPYING
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/configure.ac b/configure.ac
index a5d1cd4ebf65b07aebbc1b46f38223fe6c38a0e8..d2562d4358f00dc7dd4c19e64576dd8ace5e24f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT([ncdu],[1.15.1],[projects@yorhel.nl])
+AC_INIT([ncdu],[1.16],[projects@yorhel.nl])
 AC_CONFIG_SRCDIR([src/global.h])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([foreign std-options subdir-objects])
diff --git a/doc/ncdu.pod b/doc/ncdu.pod
index 02ac48a16a6cead68f9e0cd06ceaf012e343d3a6..2fcc981180527d2f8f215a62f12e8d027bdb2a8b 100644
--- a/doc/ncdu.pod
+++ b/doc/ncdu.pod
@@ -434,8 +434,8 @@ anything can happen.
 
 On macOS 10.15 and later, running ncdu on the root directory without
 `--exclude-firmlinks` may cause directories to be scanned and counted multiple
-times. Firmlink cycles are currently (1.15.1) not detected, so it may also
-cause ncdu to get stuck in an infinite loop and eventually run out of memory.
+times. Firmlink cycles are currently (1.16) not detected, so it may also cause
+ncdu to get stuck in an infinite loop and eventually run out of memory.
 
 Please report any other bugs you may find at the bug tracker, which can be
 found on the web site at https://dev.yorhel.nl/ncdu
diff --git a/src/browser.c b/src/browser.c
index 61f885833c509d4d143ee21d9a37d35b9d855050..7467d20cd2db7b796250fa3becec56e3bb03a853 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/browser.h b/src/browser.h
index 9f1579c9db27a69e04240fa5b3b15d1e321611ce..03c3f8b0c88e8a6c16eef0eb408e79e529f69f7a 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/delete.c b/src/delete.c
index d60ee6c40fb8ce8e84f370f65133a0388135f2fc..ab3534c04405108ec3c1c1d16465716b8ccee6bf 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/delete.h b/src/delete.h
index 6abb431ba68f8640a06871b3c13c39910474db3b..9b2dcd7f4d8096cd0a828984647458d55af5392d 100644
--- a/src/delete.h
+++ b/src/delete.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dir.h b/src/dir.h
index 39bb41fd68b28e5f90d1466f9c9541f55fbbb3ea..c46bb3178db78a441e7e7f4a4fb2fb1fff896b8a 100644
--- a/src/dir.h
+++ b/src/dir.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dir_common.c b/src/dir_common.c
index 9eb06e87d5eb3d6d254a7433a05b96a65d577ace..c67336d9d050caa00f970c94d859fc0877c3350c 100644
--- a/src/dir_common.c
+++ b/src/dir_common.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dir_export.c b/src/dir_export.c
index 83590d44bcd3d414b8ff0c08da657b74b1b95f87..3ca8fd71d32f20df1f2faf784e5ac0d77dee34e7 100644
--- a/src/dir_export.c
+++ b/src/dir_export.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dir_import.c b/src/dir_import.c
index ed5dbe28782aec44aabe5f758b80e0de4c193849..0f42d5e811c100b3e4fc06eda0e8ed00346a2b09 100644
--- a/src/dir_import.c
+++ b/src/dir_import.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dir_mem.c b/src/dir_mem.c
index f513ab76cde7d2b0f656dd7e71e74f5b03e4c32d..fa19c6aa14bf8e411d5571f76a29c591b7bddc99 100644
--- a/src/dir_mem.c
+++ b/src/dir_mem.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dir_scan.c b/src/dir_scan.c
index 9629f323ec05e79db38d48684d94bb1ee21e79c1..87b416b4d6a25cee80e749b28c24b55c9720d65c 100644
--- a/src/dir_scan.c
+++ b/src/dir_scan.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dirlist.c b/src/dirlist.c
index bf2ea01750dcc0d6a8bddb06fd4e3bd232658f61..2061007ccf35b976ba7ea550a00f4b7c098d12a7 100644
--- a/src/dirlist.c
+++ b/src/dirlist.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/dirlist.h b/src/dirlist.h
index e833b01144727171c0f03dafdcec1a54417abf39..0b0493a37b4355985e0243f4a106434c792499d5 100644
--- a/src/dirlist.h
+++ b/src/dirlist.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/exclude.c b/src/exclude.c
index 572335f876bd58fb8eac039a3f2e0abab43c8436..6a343db9a92a42ec2760b142724fa685bdaeba15 100644
--- a/src/exclude.c
+++ b/src/exclude.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/exclude.h b/src/exclude.h
index 72eff50d8d3878f6c6654b9ac28b4f7d6e0a2311..83f6c099b4ded25c34be06bc66897f2920552e5a 100644
--- a/src/exclude.h
+++ b/src/exclude.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/global.h b/src/global.h
index afb9c5e1be83e98848ddd982382e258f686f9654..a5d1b0284e1de47af2a782273d1af7ff14da3b1e 100644
--- a/src/global.h
+++ b/src/global.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/help.c b/src/help.c
index 4ceeebca2c3f132327f5d241822f880756c7e717..e0730f1f8e4cf60665d6fb278a9e6bd5a9062d64 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/help.h b/src/help.h
index 09fd553d42f31f71fac7c95f128687e5d8e81b79..0fbc38ece6ce582a432f1b0abafe90b559d445e4 100644
--- a/src/help.h
+++ b/src/help.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/main.c b/src/main.c
index 6e85c52c21d5b442e26bde64d329d01562eab4e0..c72a2081d436f34adb6f5f9310fca42ed9006eac 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/path.c b/src/path.c
index 8ccdfa9db1a9d0f9f21b5680e4a9169031a7c6e3..41232c768019bed37915963e2935145353c8fc71 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/path.h b/src/path.h
index 773da9dd9c003817f909bb6485c4969f9b8a16cf..b70adb7b49caa22ea326fa5697cf70be94685ab4 100644
--- a/src/path.h
+++ b/src/path.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/quit.c b/src/quit.c
index 154e31913c009845a4a7703111c9a0970d34a1cf..dddade5cac79cf1af830c64c30cf8814a7b79cfb 100644
--- a/src/quit.c
+++ b/src/quit.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2015-2020 Yoran Heling
+  Copyright (c) 2015-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/quit.h b/src/quit.h
index 6c50d5ede06fc512c153aa1af3cf82bc6a8f73b0..10318917938153f3c6cfe3f22f382114f5a8e10b 100644
--- a/src/quit.h
+++ b/src/quit.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2015-2020 Yoran Heling
+  Copyright (c) 2015-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/shell.c b/src/shell.c
index b881700cd05ae122866e801a89aba78dbd5c64e6..04e6033c9a57cc45bf73b3d654385d3b4a0e2feb 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
   Shell support: Copyright (c) 2014 Thomas Jarosch
 
   Permission is hereby granted, free of charge, to any person obtaining
diff --git a/src/shell.h b/src/shell.h
index b0e53b7f40f551f1c90552071baaff2d47714385..6b5709ddaa9da0e87a6087b3dac88a413a909a64 100644
--- a/src/shell.h
+++ b/src/shell.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
   Shell support: Copyright (c) 2014 Thomas Jarosch
 
   Permission is hereby granted, free of charge, to any person obtaining
diff --git a/src/util.c b/src/util.c
index 5a1abeaf22740fab5f64bcf6d6ec3aa83f70eab2..8ea0f49f9a46620d6c1afdfbd6a8c6ad6825353d 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/src/util.h b/src/util.h
index 2c3e5ed43bd0dd6391691644db73ece1d5a6e926..98b2ee334895568ef09cd144302906410be89e53 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2020 Yoran Heling
+  Copyright (c) 2007-2021 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
diff --git a/static/build.sh b/static/build.sh
index 37cfabf742adedaebdb779e20e759289e4d70917..ad61b45d0bd3af4ae444d997121c3c9d704fbc95 100755
--- a/static/build.sh
+++ b/static/build.sh
@@ -12,7 +12,7 @@
 #   where $arch = 'arm', 'i486' or 'x86_64'
 
 MUSL_CROSS_PATH=/opt/cross
-NCURSES_VERSION=6.0
+NCURSES_VERSION=6.2
 
 export CFLAGS="-O3 -g -static"