diff --git a/Changelog.md b/Changelog.md
index ee4e13446..e2f63617c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,53 @@
+# [6.0.0-alpha.18] - 2026-01-06
+
+## Added
+
+### - Formats
+
+- Flux support in AaruFormat.
+- HxCStream image format support.
+
+### - Image merge
+
+- Progress updates and localization for hardware processing.
+
+### - Media tags
+
+- Floppy write protection media tag.
+
+### - Packaging
+
+- Application icon.
+- Debian packaging files.
+- Desktop entry and package installation configuration for Linux.
+- RPM packaging files.
+
+### - Testing
+
+- Test suite for flux.
+
+## Changed
+
+### - A2R format
+
+- Updated A2R functionality.
+
+### - Database
+
+- Increase timeout to 300 seconds when updating the database.
+
+### - Dumping
+
+- Reorder columns in progress display for media dump command.
+
+### - Image merge
+
+- Add abort checks in sector processing loops in dump hardware creation.
+- Do not stop on merge if secondary image fails to copy negative or overflow sectors.
+- Do not try to merge negative or overflow sectors if secondary image lacks them.
+- Optimize sector override checks by using HashSet for O(1) lookups in dump hardware creation.
+- Sort merged hardware by the starting LBA of the first extent.
+
 # [6.0.0-alpha.17] - 2025-12-26
 
 ## Changes
@@ -2748,6 +2798,8 @@
 - Master Boot Record (aka MBR).
 - NeXT disklabels.
 
+[6.0.0-alpha.18]: https://github.com/aaru-dps/Aaru/releases/tag/v6.0.0-alpha.18
+
 [6.0.0-alpha.17]: https://github.com/aaru-dps/Aaru/releases/tag/v6.0.0-alpha.17
 
 [6.0.0-alpha.16]: https://github.com/aaru-dps/Aaru/releases/tag/v6.0.0-alpha.16
diff --git a/pkg/debian/changelog b/pkg/debian/changelog
index 816e51fc9..a23e4beb7 100644
--- a/pkg/debian/changelog
+++ b/pkg/debian/changelog
@@ -1,19 +1,26 @@
-aaru (6.0.0~alpha17-1) bookworm; urgency=medium
+aaru (6.0.0~alpha18-1) bookworm; urgency=medium
 
-  * New upstream alpha release 6.0.0-alpha.17
-  * Migration to .NET 10.0
-  * Enhanced media preservation features
-  * Improved filesystem support
-  * Bug fixes and performance improvements
+  * New upstream alpha release 6.0.0-alpha.18
+  * Added HxCStream image format support
+  * Added Flux support in AaruFormat
+  * Added Floppy_WriteProtection media tag
+  * Added RPM and Debian packaging files
+  * Added application icon and desktop entry for Linux
+  * Added test suite for flux
+  * Updated A2R functionality
+  * Optimized sector override checks using HashSet for O(1) lookups
+  * Reordered progress display columns in media dump command
+  * Increased HttpClient timeout to 300 seconds for database updates
+  * Fixed progress bar collisions
+  * Fixed bug dumping 2nd layer PFI
+  * Fixed flux display logic when no captures present
+  * Fixed missing comma in Enums.cs
+  * Fixed translation typo
+  * Enhanced image merge with better hardware processing
   * Built for Debian 12 (Bookworm) and Ubuntu 24.04 LTS (Noble)
   * Compatible with Debian 12+, Ubuntu 24.04+, and derivatives
   * Multi-architecture support (amd64, arm64, armhf)
 
- -- Natalia Portillo <claunia@claunia.com>  Tue, 31 Dec 2024 12:00:00 +0000
+ -- Natalia Portillo <claunia@claunia.com>  Tue, 06 Jan 2026 12:00:00 +0000
 
-aaru (5.3.2-1) unstable; urgency=medium
-
-  * Initial Debian package release
-
- -- Natalia Portillo <claunia@claunia.com>  Mon, 01 Jan 2024 12:00:00 +0000
 
diff --git a/pkg/rpm/aaru.spec b/pkg/rpm/aaru.spec
index 86cef5a9f..556cf4a57 100644
--- a/pkg/rpm/aaru.spec
+++ b/pkg/rpm/aaru.spec
@@ -177,15 +177,23 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/512x512/apps/aaru.png
 
 %changelog
-* Tue Dec 31 2024 Natalia Portillo <claunia@claunia.com> - 6.0.0~alpha17-1
-- New upstream alpha release 6.0.0-alpha.17
-- Migration to .NET 10.0
-- Enhanced media preservation features
-- Improved filesystem support
-- Bug fixes and performance improvements
+* Tue Jan 06 2026 Natalia Portillo <claunia@claunia.com> - 6.0.0~alpha.18-1
+- New upstream alpha release 6.0.0-alpha.18
+- Added HxCStream image format support
+- Added Flux support in AaruFormat
+- Added Floppy_WriteProtection media tag
+- Added RPM and Debian packaging files
+- Added application icon and desktop entry for Linux
+- Added test suite for flux
+- Updated A2R functionality
+- Optimized sector override checks using HashSet for O(1) lookups
+- Reordered progress display columns in media dump command
+- Increased HttpClient timeout to 300 seconds for database updates
+- Fixed progress bar collisions
+- Fixed bug dumping 2nd layer PFI
+- Fixed flux display logic when no captures present
+- Fixed missing comma in Enums.cs
+- Fixed translation typo
+- Enhanced image merge with better hardware processing
 - Built for RHEL 9+, Fedora 38+, openSUSE Leap 15.5+
 - Multi-architecture support (x86_64, aarch64, armv7hl)
-
-* Mon Jan 01 2024 Natalia Portillo <claunia@claunia.com> - 5.3.2-1
-- Initial RPM package release
-