diff --git a/woof-code/rootfs-skeleton/etc/mailcap b/woof-code/rootfs-skeleton/etc/mailcap
index cba74b4c8db..20bcc2f74fb 100644
--- a/woof-code/rootfs-skeleton/etc/mailcap
+++ b/woof-code/rootfs-skeleton/etc/mailcap
@@ -9,15 +9,15 @@ application/msword; defaultwordprocessor "%s"
 application/pdf; epdfview "%s"
 application/postscript; ghostview "%s"
 application/vnd.ms-excel; defaultspreadsheet "%s"
-application/x-bzip2; pupzip "%s"
+application/x-bzip2; defaultarchiver "%s"
 application/x-chm; chmsee "%s"
-application/x-gzip; pupzip "%s"
-application/x-tar; pupzip "%s"
-application/zip; pupzip "%s"
-application/x-compressed-tar; pupzip "%s"
-application/x-bzip-compressed-tar; pupzip "%s"
-application/x-rpm; pupzip "%s"
-application/x-rar; pupzip "%s"
+application/x-gzip; defaultarchiver "%s"
+application/x-tar; defaultarchiver "%s"
+application/zip; defaultarchiver "%s"
+application/x-compressed-tar; defaultarchiver "%s"
+application/x-bzip-compressed-tar; defaultarchiver "%s"
+application/x-rpm; defaultarchiver "%s"
+application/x-rar; defaultarchiver "%s"
 application/x-tcl; wish "%s"
 application/x-ogg; defaultmediaplayer "%s"
 application/pet; petget "%s"
diff --git a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-7z-compressed b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-7z-compressed
index 99f7316cb52..c436833c9fd 100755
--- a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-7z-compressed
+++ b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-7z-compressed
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec pupzip "$@"
+exec defaultarchiver "$@"
diff --git a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-arj b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-arj
index 99f7316cb52..c436833c9fd 100755
--- a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-arj
+++ b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-arj
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec pupzip "$@"
+exec defaultarchiver "$@"
diff --git a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma
index 99f7316cb52..c436833c9fd 100755
--- a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma
+++ b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec pupzip "$@"
+exec defaultarchiver "$@"
diff --git a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma-compressed-tar b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma-compressed-tar
index f1c63b14a79..5a65609bd1d 100755
--- a/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma-compressed-tar
+++ b/woof-code/rootfs-skeleton/root/Choices/MIME-types/application_x-lzma-compressed-tar
@@ -1,2 +1,2 @@
 #! /bin/sh
-exec pupzip "$1"
+exec defaultarchiver "$1"
diff --git a/woof-code/rootfs-skeleton/usr/local/bin/defaultarchiver b/woof-code/rootfs-skeleton/usr/local/bin/defaultarchiver
index 51fbf39b6b0..e5556f754ad 100755
--- a/woof-code/rootfs-skeleton/usr/local/bin/defaultarchiver
+++ b/woof-code/rootfs-skeleton/usr/local/bin/defaultarchiver
@@ -1,2 +1,2 @@
 #!/bin/sh
-exec puppyapps defaultarchiver "$@"
+exec pupzip "$@"
diff --git a/woof-code/rootfs-skeleton/usr/share/applications/defaults.list b/woof-code/rootfs-skeleton/usr/share/applications/defaults.list
index 7e068ee09b7..6dea35d6c21 100644
--- a/woof-code/rootfs-skeleton/usr/share/applications/defaults.list
+++ b/woof-code/rootfs-skeleton/usr/share/applications/defaults.list
@@ -8,16 +8,16 @@ application/postscript=ghostview.desktop
 application/rtf=defaultwordprocessor.desktop
 application/vnd.ms-excel=defaultspreadsheet.desktop
 application/vnd.rn-realmedia=defaultmediaplayer.desktop
-application/x-7z-compressed=pupzip.desktop
-application/x-arj=pupzip.desktop
+application/x-7z-compressed=defaultarchiver.desktop
+application/x-arj=defaultarchiver.desktop
 application/x-abiword=defaultwordprocessor.desktop
 application/x-bfe=Bcrypt-file-encryption.desktop
-application/x-bzip=pupzip.desktop
-application/x-bzip2=pupzip.desktop
-application/x-bzip-compressed-tar=pupzip.desktop
+application/x-bzip=defaultarchiver.desktop
+application/x-bzip2=defaultarchiver.desktop
+application/x-bzip-compressed-tar=defaultarchiver.desktop
 application/x-cd-image=filemnt.desktop
 application/x-chm=defaultchmviewer.desktop
-application/x-compressed-tar=pupzip.desktop
+application/x-compressed-tar=defaultarchiver.desktop
 application/x-deb=petget.desktop
 application/x-delta=Xdelta-difference-manager.desktop
 application/x-ext2-image=filemnt.desktop
@@ -25,20 +25,20 @@ application/x-ext3-image=filemnt.desktop
 application/x-ext4-image=filemnt.desktop
 application/x-flash-video=defaultmediaplayer.desktop
 application/x-gnumeric=defaultspreadsheet.desktop
-application/x-gzip=pupzip.desktop
-application/x-lzma=pupzip.desktop
-application/x-lzma-compressed-tar=pupzip.desktop
+application/x-gzip=defaultarchiver.desktop
+application/x-lzma=defaultarchiver.desktop
+application/x-lzma-compressed-tar=defaultarchiver.desktop
 application/x-ogg=defaultmediaplayer.desktop
 application/x-pkg=petget.desktop
-application/x-rar=pupzip.desktop
-application/x-rpm=pupzip.desktop
+application/x-rar=defaultarchiver.desktop
+application/x-rpm=defaultarchiver.desktop
 application/x-shockwave-flash=defaultmediaplayer.desktop
 application/x-squashfs-image=filemnt.desktop
-application/x-tar=pupzip.desktop
+application/x-tar=defaultarchiver.desktop
 application/x-tgz=petget.desktop
-application/x-xz=pupzip.desktop
-application/x-xz-compressed-tar=pupzip.desktop
-application/zip=pupzip.desktop
+application/x-xz=defaultarchiver.desktop
+application/x-xz-compressed-tar=defaultarchiver.desktop
+application/zip=defaultarchiver.desktop
 audio/basic=defaultaudioplayer.desktop
 audio/mp4=defaultaudioplayer.desktop
 audio/mpeg=defaultaudioplayer.desktop