diff --git a/archivers/xz/Makefile b/archivers/xz/Makefile
index 04d12be44c4..d55d43427ae 100644
--- a/archivers/xz/Makefile
+++ b/archivers/xz/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2012/03/29 13:38:12 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2012/06/25 11:07:22 naddy Exp $
 
 NOT_FOR_ARCHS=	${GCC2_ARCHS}
 
 COMMENT=	LZMA compression and decompression tools
 
-DISTNAME=	xz-5.0.3
-REVISION=	1
-SHARED_LIBS=	lzma                 1.0      # .5.3
+DISTNAME=	xz-5.0.4
+SHARED_LIBS=	lzma                 1.0      # .5.4
 CATEGORIES=	archivers
 
 HOMEPAGE=	http://tukaani.org/xz/
diff --git a/archivers/xz/distinfo b/archivers/xz/distinfo
index 0063e41e2b2..24e5531f957 100644
--- a/archivers/xz/distinfo
+++ b/archivers/xz/distinfo
@@ -1,5 +1,5 @@
-MD5 (xz-5.0.3.tar.gz) = /v5S+ezVId4qjOOMIaJ1dA==
-RMD160 (xz-5.0.3.tar.gz) = gfiiaNrUn0bktMrPndW8I1JRcPU=
-SHA1 (xz-5.0.3.tar.gz) = UM6EK+plGVN0V9mtkNEQoSdlZ4Y=
-SHA256 (xz-5.0.3.tar.gz) = EOtN9y3/svsUw9LYK0UOcigv/LnuOQio5bOSuPCWgb8=
-SIZE (xz-5.0.3.tar.gz) = 1257140
+MD5 (xz-5.0.4.tar.gz) = 3z32kK7xg4Th4DG+fsOpZA==
+RMD160 (xz-5.0.4.tar.gz) = Gqsp4MLCoW6HpbMi9sdggk0nX0U=
+SHA1 (xz-5.0.4.tar.gz) = PpdtdxX95DQiVyxw+Se/2uVqlMM=
+SHA256 (xz-5.0.4.tar.gz) = 1nQFeY2tZFll/lHPTkDCPRIB+yNDeNPET1o3hxQrg7Y=
+SIZE (xz-5.0.4.tar.gz) = 1281166
diff --git a/archivers/xz/patches/patch-config_h_in b/archivers/xz/patches/patch-config_h_in
index 357513cfad6..79f99cfefce 100644
--- a/archivers/xz/patches/patch-config_h_in
+++ b/archivers/xz/patches/patch-config_h_in
@@ -1,7 +1,7 @@
-$OpenBSD: patch-config_h_in,v 1.1 2011/07/27 19:06:45 naddy Exp $
---- config.h.in.orig	Wed Jul 27 20:37:33 2011
-+++ config.h.in	Wed Jul 27 20:38:31 2011
-@@ -289,7 +289,11 @@
+$OpenBSD: patch-config_h_in,v 1.2 2012/06/25 11:07:22 naddy Exp $
+--- config.h.in.orig	Fri Jun 22 13:56:06 2012
++++ config.h.in	Sat Jun 23 23:03:36 2012
+@@ -292,7 +292,11 @@
  
  /* Define to 1 if the system supports fast unaligned access to 16-bit and
     32-bit integers. */
diff --git a/archivers/xz/pkg/PLIST b/archivers/xz/pkg/PLIST
index 5e7d60ce7c5..efb5d36826b 100644
--- a/archivers/xz/pkg/PLIST
+++ b/archivers/xz/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2011/05/27 19:08:20 naddy Exp $
+@comment $OpenBSD: PLIST,v 1.6 2012/06/25 11:07:22 naddy Exp $
 @conflict lzma-*
 @pkgpath archivers/lzma
 %%SHARED%%
@@ -77,8 +77,14 @@ share/doc/xz/COPYING
 @comment share/doc/xz/THANKS
 @comment share/doc/xz/TODO
 share/doc/xz/examples/
-share/doc/xz/examples/xz_pipe_comp.c
-share/doc/xz/examples/xz_pipe_decomp.c
+share/doc/xz/examples/00_README.txt
+share/doc/xz/examples/01_compress_easy.c
+share/doc/xz/examples/02_decompress.c
+share/doc/xz/examples/03_compress_custom.c
+share/doc/xz/examples/Makefile
+share/doc/xz/examples_old/
+share/doc/xz/examples_old/xz_pipe_comp.c
+share/doc/xz/examples_old/xz_pipe_decomp.c
 share/doc/xz/faq.txt
 share/doc/xz/history.txt
 share/doc/xz/lzma-file-format.txt