diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8d31dbd0..93037f63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,21 @@
 RELEASE NOTES
 =============
 
+v0.36
+-----------------------
+- Added the abbreviation MMC for mmcblk devices such as SD and microSD cards and some low budget laptops. #526
+- Fixed some serial numbers that were displaying garbage. #527
+- Fixed auto power off and nowait when the screen has been blanked by the user. #529
+- Fixed nwipe not auto exiting on completion when in non gui mode. #531
+- Fixed smart page titles so they have a consistent format with page 1 in the PDF report. #532
+- Fixed some of the config help messages that displayed incorrect information. #533
+- Inserted a space between temperature and model. #534
+- Fixed incorrect footer on return to organisation/customer preview screen. #535
+- Made footer completion message more informative. #538
+- Fixed hidden sector detection for devices with logical/physical size of 4096/4096. #543 #546
+- Fixed some strcpy compiler warnings. #548
+
+
 v0.35
 -----------------------
 - Nwipe will now optionally create a multi-page PDF certificate that shows details of a specific discs erasure. The first page forms the certificate of erasure and subsequent pages show the drives smart data. Two related options have been added to nwipe's command line options -P, --PDFreportpath=PATH Path to write PDF reports to. Default is "." If set to "noPDF" no PDF reports are written. From the drive selection screen you can now press 'c' for config. This takes you to the configuration screen where you can select various PDF certificate related options such as enabling PDF, entering customer or company data for entry onto the certificate and enabling a preview of customer/company info prior to the drive selection screen starting.
diff --git a/configure.ac b/configure.ac
index 93a56411..a2b34502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.63])
-AC_INIT([nwipe],[0.35.9],[git@brumit.nl])
+AC_INIT([nwipe],[0.36],[git@brumit.nl])
 AM_INIT_AUTOMAKE(foreign subdir-objects)
 AC_CONFIG_FILES([Makefile src/Makefile man/Makefile])
 AC_OUTPUT
diff --git a/man/nwipe.1 b/man/nwipe.1
index 2b2145c2..d7981ad1 100644
--- a/man/nwipe.1
+++ b/man/nwipe.1
@@ -1,4 +1,4 @@
-.TH NWIPE "16" "February 2024" "nwipe version 0.35.9" "User Commands"
+.TH NWIPE "20" "February 2024" "nwipe version 0.36" "User Commands"
 .SH NAME
 nwipe \- securely erase disks
 .SH SYNOPSIS
diff --git a/src/version.c b/src/version.c
index 094b6a28..cbaa1069 100644
--- a/src/version.c
+++ b/src/version.c
@@ -4,7 +4,7 @@
  * used by configure to dynamically assign those values
  * to documentation files.
  */
-const char* version_string = "0.35.9";
+const char* version_string = "0.36";
 const char* program_name = "nwipe";
 const char* author_name = "Martijn van Brummelen";
 const char* email_address = "git@brumit.nl";
@@ -14,4 +14,4 @@ Modifications to original dwipe Copyright Andy Beverley <andy@andybev.com>\n\
 This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS\n\
 FOR A PARTICULAR PURPOSE.\n";
-const char* banner = "nwipe 0.35.9";
+const char* banner = "nwipe 0.36";