diff --git a/Changes b/Changes
index b19f50a..0dd786d 100644
--- a/Changes
+++ b/Changes
@@ -1,7 +1,8 @@
 0.22 2016-10-26
         - Added support for document extraction
+        - Fixed archive naming
 
-0.21 2016-10-14
+0.21 2016-10-24
         - Improved Windows support
 
 0.20 2016-10-15
diff --git a/script/korapxml2krill b/script/korapxml2krill
index d00ba9e..5ed8c7f 100644
--- a/script/korapxml2krill
+++ b/script/korapxml2krill
@@ -70,6 +70,9 @@
 # 2016/10/24
 # - Improved Windows support
 #
+# 2016/10/24
+# - Added support for document extraction
+#
 # ----------------------------------------------------------
 
 our $LAST_CHANGE = '2016/10/24';
@@ -258,6 +261,7 @@
   $file =~ s/^?\/?$i//;
   $file =~ tr/\//-/;
   $file =~ s{^-+}{};
+  $file =~ s/^.*?-(.+?-.+?-.+?)$/$1/;
   return $file;
 };