diff --git a/Main/Properties/AssemblyInfo.cs b/Main/Properties/AssemblyInfo.cs
index cb7fb4b..cf76458 100644
--- a/Main/Properties/AssemblyInfo.cs
+++ b/Main/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.0.17")]
-[assembly: AssemblyFileVersion("0.6.0.17")]
+[assembly: AssemblyVersion("0.6.0.18")]
+[assembly: AssemblyFileVersion("0.6.0.18")]
diff --git a/Release Notes.txt b/Release Notes.txt
index e6e4879..68a718f 100644
--- a/Release Notes.txt	
+++ b/Release Notes.txt	
@@ -1,8 +1,7 @@
-Release 0.6.0.17
+Release 0.6.0.18
 ----------------
-Added PR#38 - Fix crash that can happen when using some cluster+capacity combinations on F256
-Added PR#40 - Add F256 RNG reg support
-Added PR#41 - Remember user's setting for view size, and allow setting view scale from a preset list
+Merged PR #42: Allow right-clicking on the debug window to copy to clipboard.
+Merged PR #43: Use dropdown for selecting the board mode instead of a button that linear searches.
 
 ** TODO: Update the Keyboard device for F256Jr (PS/2 ScanCode Set 2).
 ** TODO: Users can now modify the CPU registers when in debug mode. The registers have a white background when editable.
@@ -11,6 +10,12 @@ Added PR#41 - Remember user's setting for view size, and allow setting view scal
 ** TODO: Setup Virtual Joystick for the F256.
 ** TODO: Implement and IEC interface to connect via USB to XUM1541
 
+Release 0.6.0.17
+----------------
+Added PR#38 - Fix crash that can happen when using some cluster+capacity combinations on F256
+Added PR#40 - Add F256 RNG reg support
+Added PR#41 - Remember user's setting for view size, and allow setting view scale from a preset list
+
 Release 0.6.0.16
 ----------------
 Fixed regression error - the CLI fix was undone.
@@ -19,7 +24,6 @@ Fixed issue when deleting breakpoints.
 Added PR#36 - Remember the user's choices for SD card settings.
 Added PR#37 - Add SD card support for F256.
 
-
 Release 0.6.0.15
 ----------------
 Merged PR#34 - Establish compatibility with Mono on Linux.