diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index e9303a4786d2..0c0d8ef2c7ba 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,44 +1,44 @@
 # New ports collection makefile for:	upx
 # Date created:				17 Feb 2004
 # Whom:					Max Khon <fjoe@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	upx
-PORTVERSION=	3.04
+PORTVERSION=	3.05
 CATEGORIES=	archivers
 MASTER_SITES=	http://upx.sourceforge.net/download/\
-		SF/sevenzip/7-Zip/4.57:lzma
+		SF/sevenzip/7-Zip/${LZMA_VER}:lzma
 DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}\
 		7z${LZMA_VER:S/.//g}${EXTRACT_SUFX}:lzma
 
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	The Ultimate Packer for eXecutables
 
 LIB_DEPENDS=	ucl.1:${PORTSDIR}/archivers/ucl
 
-LZMA_VER=	4.57
+LZMA_VER=	4.65
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-src
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
 MAKE_ENV=	UPX_UCLDIR=${LOCALBASE}\
 		UPX_LZMADIR=${WRKDIR}\
 		target=freebsd
 NOT_FOR_ARCHS=	sparc64
 
 PORTDOCS=	BUGS COPYING LICENSE NEWS PROJECTS README\
 		README.1ST README.SRC THANKS TODO
 MAN1=		upx.1
 PLIST_FILES=	bin/upx
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/upx.out ${PREFIX}/bin/upx
 	@${INSTALL_MAN} ${WRKSRC}/doc/upx.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/
 .endif
 
 .include <bsd.port.mk>
diff --git a/archivers/upx/distinfo b/archivers/upx/distinfo
index 61fd9e414964..9bb476c2bd6f 100644
--- a/archivers/upx/distinfo
+++ b/archivers/upx/distinfo
@@ -1,6 +1,6 @@
-MD5 (upx-3.04-src.tar.bz2) = 68d662b1f831335460f9bfdbf632c6ce
-SHA256 (upx-3.04-src.tar.bz2) = 69b8652f316085628c6136a561a1ebc43f7986fba099dda2556e07e1d4977d97
-SIZE (upx-3.04-src.tar.bz2) = 782454
-MD5 (7z457.tar.bz2) = a504b4174d3960ef93539986b5a092fa
-SHA256 (7z457.tar.bz2) = 09fc3719fbe373edd1c62bf8e48c1f98caea4522c26d0244aa40d2058ee2fd7e
-SIZE (7z457.tar.bz2) = 620119
+MD5 (upx-3.05-src.tar.bz2) = 1f0ca94c8c26a816402274dd7e628334
+SHA256 (upx-3.05-src.tar.bz2) = 08c5edaad52f7f3c877f1e4ea4c85a9a87b0a0dcc8c5adeafff3b00436c71eeb
+SIZE (upx-3.05-src.tar.bz2) = 861139
+MD5 (7z465.tar.bz2) = 6c5be18da090c42516b4166e2fb2a201
+SHA256 (7z465.tar.bz2) = cce25c2b7c98ccb598b1393c302ff56a5c51fe2a5aae9c3885bec007eb06fc70
+SIZE (7z465.tar.bz2) = 658088
diff --git a/archivers/upx/files/patch-src-miniacc.h b/archivers/upx/files/patch-src-miniacc.h
deleted file mode 100644
index f00bdfdeb37e..000000000000
--- a/archivers/upx/files/patch-src-miniacc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/miniacc.h.orig	2007-08-24 04:34:35.884000000 +0000
-+++ src/miniacc.h	2007-08-24 04:35:22.215000000 +0000
-@@ -1302,7 +1302,7 @@
- #elif !defined(ACC_ABI_BIG_ENDIAN) && !defined(ACC_ABI_LITTLE_ENDIAN)
- #if (ACC_ARCH_ALPHA) && (ACC_ARCH_CRAY_MPP)
- #  define ACC_ABI_BIG_ENDIAN        1
--#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430)
-+#elif (ACC_ARCH_ALPHA || ACC_ARCH_AMD64 || ACC_ARCH_BLACKFIN || ACC_ARCH_CRIS || ACC_ARCH_I086 || ACC_ARCH_I386 || ACC_ARCH_MSP430 || ACC_ARCH_IA64)
- #  define ACC_ABI_LITTLE_ENDIAN     1
- #elif (ACC_ARCH_M68K || ACC_ARCH_S390)
- #  define ACC_ABI_BIG_ENDIAN        1