Index: audio/Makefile
===================================================================
--- audio/Makefile	(revision 402431)
+++ audio/Makefile	(working copy)
@@ -535,6 +535,7 @@
     SUBDIR += opencore-amr
     SUBDIR += openspc
     SUBDIR += optimfrog
+    SUBDIR += optimfrog-sse2
     SUBDIR += opus
     SUBDIR += opus-tools
     SUBDIR += opusfile
Index: audio/optimfrog/Makefile
===================================================================
--- audio/optimfrog/Makefile	(revision 402431)
+++ audio/optimfrog/Makefile	(working copy)
@@ -1,26 +1,40 @@
-# Created by: Andrew Pantyukhin <infofarmer@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	optimfrog
-DISTVERSION=	4.520b1
-CATEGORIES=	audio linux
-MASTER_SITES=	http://www.losslessaudio.org/DownloadNew/OptimFROG_All_Linux_x86_${DISTVERSION:S/.//}.php?
-DISTNAME=	OptimFROG_All_Linux_x86_${DISTVERSION:S/.//}
+PORTVERSION=	5.003
+CATEGORIES=	audio
+MASTER_SITES=	http://losslessaudio.org/Downloads/A1C0/${DISTVERSION:S/.//}/FreeBSD/
+DISTNAME=	# OptimFROG_FreeBSD_${ARCH}_${DISTVERSION:S/.//}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Lossless audio codec
+MAINTAINER=	matthew@reztek.cz
+COMMENT?=	Best-ratio lossless audio codec
 
-ONLY_FOR_ARCHS=	amd64 i386
+INSTALL_CONFLICTS?=	optimfrog-sse2-[0-9]*
 
+ONLY_FOR_ARCHS?=	amd64 i386
+
 NO_CDROM=	No commercial use
 NO_BUILD=	yes
-USES=		zip
-USE_LINUX=	yes
-PLIST_FILES=	bin/off bin/ofr bin/ofs
-FETCH_ARGS=	-o ${DISTDIR}/${DISTFILES}
+USE_LDCONFIG=	yes
 
+OPTIONS_DEFINE_i386=	SSE2
+OPTIONS_DEFINE?=	#
+SSE2_DESCR=	Use SSE2 instructions
+SSE2_VARS=	PKGNAMESUFFIX=-sse2
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+DISTNAME=	OptimFROG_FreeBSD_x64_${DISTVERSION:S/.//}
+.else # ${ARCH} == "i386"
+. if ${PORT_OPTIONS:MSSE2}
+DISTNAME=	OptimFROG_FreeBSD_x86_SSE2_${DISTVERSION:S/.//}
+. else
+DISTNAME=	OptimFROG_FreeBSD_x86_${DISTVERSION:S/.//}
+. endif
+.endif
+
 do-install:
-	@${BRANDELF} -t Linux ${WRKSRC}/off ${WRKSRC}/ofr ${WRKSRC}/ofs
-	@${INSTALL_PROGRAM} ${WRKSRC}/off ${WRKSRC}/ofr ${WRKSRC}/ofs ${STAGEDIR}${PREFIX}/bin/
+	@(cd ${WRKSRC} && ./install.sh -d ${STAGEDIR})
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: audio/optimfrog/distinfo
===================================================================
--- audio/optimfrog/distinfo	(revision 402431)
+++ audio/optimfrog/distinfo	(working copy)
@@ -1,2 +1,6 @@
-SHA256 (OptimFROG_All_Linux_x86_4520b1.zip) = 69d2aeb581be15278920576cc35b5398c1d22d79abf017bedc04f8aba295710d
-SIZE (OptimFROG_All_Linux_x86_4520b1.zip) = 1171509
+SHA256 (OptimFROG_FreeBSD_x64_5003.tar.gz) = 8fdf1c9314be45677b6fba521ead09aa0ff37fc3477076030a7ecb93646025cd
+SIZE (OptimFROG_FreeBSD_x64_5003.tar.gz) = 1033888
+SHA256 (OptimFROG_FreeBSD_x86_5003.tar.gz) = 94f6afcac8c7e249b4c666a8c69fd2d8acd541a2bb510b5a23326722c278670f
+SIZE (OptimFROG_FreeBSD_x86_5003.tar.gz) = 981489
+SHA256 (OptimFROG_FreeBSD_x86_SSE2_5003.tar.gz) = 32c8bc83928a5f4bc19b9ad40e65f218fabdcf9d251fa63066bc1077374c13e9
+SIZE (OptimFROG_FreeBSD_x86_SSE2_5003.tar.gz) = 987641
Index: audio/optimfrog/pkg-plist
===================================================================
--- audio/optimfrog/pkg-plist	(nonexistent)
+++ audio/optimfrog/pkg-plist	(working copy)
@@ -0,0 +1,11 @@
+bin/off
+bin/ofr
+bin/ofr_sfx
+bin/ofs
+include/OptimFROG/OptimFROG.h
+include/OptimFROG/OptimFROGDecoder.h
+include/OptimFROG/PortableTypes.h
+include/OptimFROG/SystemID.h
+lib/libOptimFROG.so
+lib/libOptimFROG.so.0
+libdata/pkgconfig/optimfrog.pc
Index: audio/optimfrog-sse2/Makefile
===================================================================
--- audio/optimfrog-sse2/Makefile	(nonexistent)
+++ audio/optimfrog-sse2/Makefile	(working copy)
@@ -0,0 +1,11 @@
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../optimfrog
+COMMENT=	Best-ratio lossless audio codec (SSE2 required)
+
+INSTALL_CONFLICTS=	optimfrog-[0-9]*
+
+ONLY_FOR_ARCHS=	i386
+OPTIONS_DEFAULT=	SSE2
+
+.include "${MASTERDIR}/Makefile"