diff --git a/doc/changelog.txt b/doc/changelog.txt
index ca6bf55..8e46c1b 100644
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -1,5 +1,7 @@
 1.8 (released xx.xx.xxxx)
 
+* Added support for ZPAQ archives.
+
 
 1.7 (released 27.6.2014)
 
@@ -7,7 +9,7 @@
 * Fixed creation of LZMA files with the Python lzma module.
 * Handle *.epub and *.apk files as ZIP files.
 
- 
+
 1.6 (released 8.6.2014)
 
 * Search /usr/local/lib for p7zip RAR modules.
diff --git a/doc/patool.1 b/doc/patool.1
index b117dc7..bc3bcb2 100644
--- a/doc/patool.1
+++ b/doc/patool.1
@@ -29,7 +29,7 @@ APE (.ape), AR (.a), ARC (.arc), ARJ (.arj),
 BZIP2 (.bz2), CAB (.cab), COMPRESS (.Z), CPIO (.cpio), DEB (.deb), DMS (.dms),
 FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz), LZH (.lha, .lzh), LZIP (.lz),
 LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar), RZIP (.rz), SHN (.shn),
-TAR (.tar), XZ (.xz), ZIP (.zip, .jar) and ZOO (.zoo) formats.
+TAR (.tar), XZ (.xz), ZIP (.zip, .jar), ZOO (.zoo) and ZPAQ (.zpaq) formats.
 It relies on helper applications to handle those archive formats
 (for example bzip2 for BZIP2 archives).
 .PP
diff --git a/doc/web/content/index.md b/doc/web/content/index.md
index f8cb984..61d38f7 100644
--- a/doc/web/content/index.md
+++ b/doc/web/content/index.md
@@ -25,8 +25,9 @@ APE  (.ape), AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2), CAB
 (.cab), COMPRESS (.Z), CPIO (.cpio), DEB  (.deb),  DMS  (.dms),
 FLAC  (.flac), GZIP (.gz), LRZIP (.lrz), LZH (.lha, .lzh), LZIP
 (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm), RAR (.rar),  RZIP
-(.rz),  SHN  (.shn), TAR (.tar), XZ (.xz), ZIP (.zip, .jar) and
-ZOO (.zoo) formats.  It relies on helper applications to handle
+(.rz),  SHN  (.shn), TAR (.tar), XZ (.xz), ZIP (.zip, .jar),
+ZOO (.zoo) and ZPAQ (.zpaq) formats.
+It relies on helper applications to handle
 those archive formats (for example bzip2 for BZIP2 archives).
 
 The  archive  formats  TAR, ZIP, BZIP2 and
diff --git a/setup.py b/setup.py
index 346b510..cd91cac 100644
--- a/setup.py
+++ b/setup.py
@@ -431,8 +431,8 @@ AR (.a), ARC (.arc), ARJ (.arj), BZIP2 (.bz2),
 CAB (.cab), COMPRESS (.Z), CPIO (.cpio),
 DEB (.deb), DMS (.dms), FLAC (.flac), GZIP (.gz), ISO (.iso), LRZIP (.lrz),
 LZH (.lha, .lzh), LZIP (.lz), LZMA (.lzma), LZOP (.lzo), RPM (.rpm),
-RAR (.rar), RZIP (.rz), SHN (.shn), TAR (.tar), XZ (.xz), ZIP (.zip, .jar)
-and ZOO (.zoo) formats.
+RAR (.rar), RZIP (.rz), SHN (.shn), TAR (.tar), XZ (.xz), ZIP (.zip, .jar),
+ZOO (.zoo) and ZPAQ (.zpaq) formats.
 It relies on helper applications to handle those archive formats
 (for example bzip2 for BZIP2 archives).