diff --git a/misc/Makefile b/misc/Makefile
index 60d63ebb9849..ff77afc5620f 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -191,6 +191,7 @@
     SUBDIR += iso-codes
     SUBDIR += jargon
     SUBDIR += jbidwatcher
+    SUBDIR += jojodiff
     SUBDIR += kbdscan
     SUBDIR += kcd
     SUBDIR += kde-thumbnailer-chm
diff --git a/misc/jojodiff/Makefile b/misc/jojodiff/Makefile
new file mode 100644
index 000000000000..8e226c996916
--- /dev/null
+++ b/misc/jojodiff/Makefile
@@ -0,0 +1,43 @@
+# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	jojodiff
+PORTVERSION=	0.8.1
+CATEGORIES=	misc devel
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}08
+DISTNAME=	jdiff${PORTVERSION:S/.//g}
+
+MAINTAINER=	danfe@FreeBSD.org
+COMMENT=	Diff and patch utilities for binary files
+
+LICENSE=	GPLv3+
+
+USES=		gmake tar:tgz
+MAKE_ARGS=	CC="${CC}" CPP="${CXX}" CFLAGS="${CFLAGS}"
+WRKSRC_SUBDIR=	src
+
+PLIST_FILES=	bin/jdiff bin/jptch
+PORTDOCS=	readme.txt readme.htm
+
+OPTIONS_DEFINE=	DOCS
+
+post-patch:
+	@${REINPLACE_CMD} -E 's,P(RI|8)(zd|hkey), & ,g' \
+		${WRKSRC}/JFileAhead.cpp ${WRKSRC}/JFileIStreamAhead.cpp \
+		${WRKSRC}/JHashPos.cpp ${WRKSRC}/JOutAsc.cpp \
+		${WRKSRC}/JOutRgn.cpp ${WRKSRC}/jpatch.cpp \
+		${WRKSRC}/main.cpp
+	@${REINPLACE_CMD} -e 's,is %d bit,is %zu bit,' \
+		${WRKSRC}/jpatch.cpp ${WRKSRC}/main.cpp
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/j???? ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${TR} -d \\r < ${WRKSRC}/../${f} | iconv -f latin1 -t utf8 \
+		> ${STAGEDIR}${DOCSDIR}/${f}
+.endfor
+
+.include <bsd.port.mk>
diff --git a/misc/jojodiff/distinfo b/misc/jojodiff/distinfo
new file mode 100644
index 000000000000..dd2f4a35df39
--- /dev/null
+++ b/misc/jojodiff/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1322937085
+SHA256 (jdiff081.tgz) = 8681e503c1d9658a89788d7e4c34c08adce5a0114610cfaaefa32f2bbe613058
+SIZE (jdiff081.tgz) = 427616
diff --git a/misc/jojodiff/pkg-descr b/misc/jojodiff/pkg-descr
new file mode 100644
index 000000000000..fdf61ef98028
--- /dev/null
+++ b/misc/jojodiff/pkg-descr
@@ -0,0 +1,14 @@
+JDIFF is a program that outputs the differences between two binary files,
+either in binary format or human readable format (detailed or summarized).
+JPTCH can then be used to reconstruct the second file from the first file.
+
+Possible applications include incremental backups, synchronising files
+between two computers over a slow network, and others.
+
+JDIFF tries to find a minimal set of differences between two files using
+a heuristic algorithm with constant space and linear time complexity.
+This means that accuracy is traded over speed.  JDIFF will therefore, in
+general, not always find the smallest set of differences, but will try
+to be fast and will use a fixed amount of memory.
+
+WWW: http://jojodiff.sourceforge.net/