diff --git a/README.md b/README.md
index 0467cc1..8aa0b60 100644
--- a/README.md
+++ b/README.md
@@ -121,11 +121,19 @@ Be patient. Next time it will get it from your local cache.
 
 ## Changelog
 
+### 0.6.1
+
+Fixes:
+
+- [#25](https://github.com/micheldebree/retropixels/issues/25):
+  Koala export is broken. (Thanks to Alex Goldblat for reporting this)
+
 ### 0.6.0
 
 Features:
 
-- [#19](https://github.com/micheldebree/retropixels/issues/19): Undocumented 'fake' modes.
+- [#19](https://github.com/micheldebree/retropixels/issues/19):
+  Undocumented fake modes.
 
 Fixes:
 [#21](https://github.com/micheldebree/retropixels/issues/21),
diff --git a/index.js b/index.js
index 05b14a0..eebca23 100755
--- a/index.js
+++ b/index.js
@@ -24,7 +24,7 @@ let ditherMode = 'bayer4x4';
 let ditherRadius = 32;
 
 cli
-  .version('0.6.0')
+  .version('0.6.1')
   .usage('[options] <infile> <outfile>')
   .option('-m, --mode <graphicMode>', 'c64Multicolor (default), c64Hires, c64HiresMono, c64FLI, c64AFLI')
   .option('-d, --ditherMode <ditherMode>', 'bayer2x2, bayer4x4 (default), bayer8x8')
@@ -96,9 +96,9 @@ function saveExecutable(nativeImage, viewerFilename) {
 
 // Save PixelImage as a KoalaPaint image.
 function saveKoala(pixelImage) {
+  const mapper = new C64Mapper.C64Mapper();
   const koalaImage = KoalaPicture.KoalaPicture.fromPixelImage(pixelImage);
-  koalaImage.save(outFile, function(err) {
-    if (err) throw err;
+  mapper.save(koalaImage.toMemoryMap(), outFile, () => {
     console.log('Written Koala Painter file ' + outFile);
   });
 }
diff --git a/makefile b/makefile
index f22b27b..3bbc3cf 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-VERSION=0.6.0
+VERSION=0.6.1
 EXAMPLE=paintface
 DOCKERIMAGE=micheldebree/retropixels-cli:$(VERSION)
 DOCKERCMD=docker run -t --rm -v "$$PWD":/data $(DOCKERIMAGE)
@@ -47,6 +47,7 @@ docker_debug: dockerimage
 samples: compile
 	$(LOCALCMD) paintface.jpg ./samples/paintface-Multicolor.png
 	$(LOCALCMD) paintface.jpg ./samples/paintface-Multicolor.prg
+	$(LOCALCMD) paintface.jpg ./samples/paintface-Multicolor.kla
 	$(LOCALCMD) -m c64Hires paintface.jpg ./samples/paintface-Hires.png
 	$(LOCALCMD) -m c64Hires paintface.jpg ./samples/paintface-Hires.prg
 	$(LOCALCMD) -m c64HiresMono paintface.jpg ./samples/paintface-HiresMono.png
diff --git a/package.json b/package.json
index ce071d6..4488f96 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "retropixels",
-    "version": "0.6.0",
+    "version": "0.6.1",
     "description": "A cross platform command line tool to convert images to Commodore 64 format.",
     "main": "index.js",
     "bin": {