diff --git a/COPYING b/COPYING
index c772294..914db91 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2007-2014 Yoran Heling
+Copyright (c) 2007-2016 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 fec291c..7db6875 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1.12 - 2016-08-24
+	- Add NCDU_SHELL environment variable
+	- Add --confirm-quit flag
+	- Fix compilation due to missing sys/wait.h include
+
 1.11 - 2015-04-05
 	- Added 'b' key to spawn shell in the current directory
 	- Support scanning (and refreshing) of empty directories
diff --git a/README b/README
index 6314da2..ec5c232 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-ncdu 1.11g
+ncdu 1.12g
 ==========
 
 DESCRIPTION
@@ -33,7 +33,7 @@ INSTALL
 
 COPYING
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 4a9bd7a..5086f92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 
-AC_INIT(ncdu, 1.11g, projects@yorhel.nl)
+AC_INIT(ncdu, 1.12g, projects@yorhel.nl)
 AC_CONFIG_SRCDIR([src/global.h])
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
diff --git a/doc/ncdu.pod b/doc/ncdu.pod
index 14ca87b..f752232 100644
--- a/doc/ncdu.pod
+++ b/doc/ncdu.pod
@@ -325,7 +325,7 @@ If you have a directory with more than 2 billion files, quite literally
 anything can happen.
 
 Please report any other bugs you may find at the bug tracker, which can be
-found on the web site at http://dev.yorhel.nl/ncdu
+found on the web site at https://dev.yorhel.nl/ncdu
 
 
 =head1 AUTHOR
diff --git a/src/browser.c b/src/browser.c
index 64f9bc6..e26683b 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 bc3f3fc..1f4e35e 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 55afd2f..44cf4a4 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 91b9eaa..162ad03 100644
--- a/src/delete.h
+++ b/src/delete.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 c8445bf..03456cf 100644
--- a/src/dir.h
+++ b/src/dir.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 a670069..f8c0657 100644
--- a/src/dir_common.c
+++ b/src/dir_common.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 a69b030..10cf028 100644
--- a/src/dir_export.c
+++ b/src/dir_export.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 53edaac..eaf625f 100644
--- a/src/dir_import.c
+++ b/src/dir_import.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 a7adfb0..ad91628 100644
--- a/src/dir_mem.c
+++ b/src/dir_mem.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 ab140a6..677c93d 100644
--- a/src/dir_scan.c
+++ b/src/dir_scan.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 b7f4161..50b90f0 100644
--- a/src/dirlist.c
+++ b/src/dirlist.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 9107fac..94805be 100644
--- a/src/dirlist.h
+++ b/src/dirlist.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 6ceaa15..d75ba0b 100644
--- a/src/exclude.c
+++ b/src/exclude.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 4785091..fde71fe 100644
--- a/src/exclude.h
+++ b/src/exclude.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 679888d..e2c0b76 100644
--- a/src/global.h
+++ b/src/global.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 8c130d7..56a6a00 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the
@@ -154,7 +154,7 @@ void help_draw() {
       ncaddstr(y+2, x+30, "Usage");
       ncprint( y+4, x+30, "%s", PACKAGE_VERSION);
       ncaddstr( 9,  7, "Written by Yoran Heling <projects@yorhel.nl>");
-      ncaddstr(10, 16, "http://dev.yorhel.nl/ncdu/");
+      ncaddstr(10, 16, "https://dev.yorhel.nl/ncdu/");
       break;
   }
 }
diff --git a/src/help.h b/src/help.h
index 815675d..8415f6e 100644
--- a/src/help.h
+++ b/src/help.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 1ef59ab..a5ad2f6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 c9f45f2..1fa4f88 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 9054220..1b1a731 100644
--- a/src/path.h
+++ b/src/path.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 8a0d9d3..2738d17 100644
--- a/src/quit.c
+++ b/src/quit.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2015 Yoran Heling
+  Copyright (c) 2015-2016 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 54b03d8..29706fd 100644
--- a/src/quit.h
+++ b/src/quit.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2015 Yoran Heling
+  Copyright (c) 2015-2016 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 86d8095..287fe67 100644
--- a/src/shell.c
+++ b/src/shell.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 712be06..6c8419a 100644
--- a/src/shell.h
+++ b/src/shell.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 2028893..1ae8c6c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 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 3618d6d..a327239 100644
--- a/src/util.h
+++ b/src/util.h
@@ -1,6 +1,6 @@
 /* ncdu - NCurses Disk Usage
 
-  Copyright (c) 2007-2014 Yoran Heling
+  Copyright (c) 2007-2016 Yoran Heling
 
   Permission is hereby granted, free of charge, to any person obtaining
   a copy of this software and associated documentation files (the