diff --git a/archivers/lzma/Makefile b/archivers/lzma/Makefile
index c181551a773b..755c55b50eb4 100644
--- a/archivers/lzma/Makefile
+++ b/archivers/lzma/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	lzma
-PORTVERSION=	4.0.6
+PORTVERSION=	4.17
 CATEGORIES=	archivers
 MASTER_SITES=	http://www.7-zip.org/dl/
 DISTNAME=	lzma${PORTVERSION:S/.//g}
@@ -15,7 +15,7 @@ MAINTAINER=	jylefort@FreeBSD.org
 COMMENT=	Command line lzma archiver
 
 USE_GCC=	3.4+
-USE_ZIP=	yes
+USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
 NO_WRKSUBDIR=	yes
@@ -30,7 +30,8 @@ PORTDOCS=	*.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^CXX = .*||; \
+		's|^CXX.*||; \
+		 s|$$(CXX_C)|$$(CC)|; \
 		 s|^CFLAGS =|CFLAGS +=|' \
 		${BUILD_WRKSRC}/${MAKEFILE}
 
diff --git a/archivers/lzma/distinfo b/archivers/lzma/distinfo
index 7ea0f1eb1338..711176da8cec 100644
--- a/archivers/lzma/distinfo
+++ b/archivers/lzma/distinfo
@@ -1,2 +1,2 @@
-MD5 (lzma406.zip) = a09378411cba5f786b5c49c9c58496df
-SIZE (lzma406.zip) = 185934
+MD5 (lzma417.tar.bz2) = b1ab85e4dc1eb1323d77fef47a2cb71c
+SIZE (lzma417.tar.bz2) = 161670