diff --git a/textproc/mgdiff/Makefile b/textproc/mgdiff/Makefile
new file mode 100644
index 00000000000..0b4ab79f45a
--- /dev/null
+++ b/textproc/mgdiff/Makefile
@@ -0,0 +1,25 @@
+# OpenBSD makefile for:    		mgdiff
+# Version required:     		1.0
+# Date created:         		May 21 1998
+# Whom:                 		Angelos D. Keromytis
+#
+# $OpenBSD: Makefile,v 1.1.1.1 1998/05/22 01:16:52 angelos Exp $
+#
+
+DISTNAME=	mgdiff
+PKGNAME=	mgdiff-1.0
+CATEGORIES=	textproc
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
+MASTER_SITE_SUBDIR=	applications
+
+MAINTAINER=	angelos@openbsd.org
+
+REQUIRES_MOTIF=	yes
+USE_IMAKE=      yes
+
+post-install:
+	@${MKDIR} ${PREFIX}/lib/X11/mgdiff
+	@${INSTALL_DATA} ${WRKSRC}/mgdiff.x[bp]m ${PREFIX}/lib/X11/mgdiff
+	@${CAT} ${PKGDIR}/MESSAGE
+
+.include <bsd.port.mk>
diff --git a/textproc/mgdiff/files/md5 b/textproc/mgdiff/files/md5
new file mode 100644
index 00000000000..2821c5bef62
--- /dev/null
+++ b/textproc/mgdiff/files/md5
@@ -0,0 +1 @@
+MD5 (mgdiff.tar.gz) = da896496dcb9ef2947496472f094b65f
diff --git a/textproc/mgdiff/patches/patch-aa b/textproc/mgdiff/patches/patch-aa
new file mode 100644
index 00000000000..075f73291ab
--- /dev/null
+++ b/textproc/mgdiff/patches/patch-aa
@@ -0,0 +1,27 @@
+*** Imakefile.orig	Thu May 19 04:01:00 1994
+--- Imakefile	Sat Nov  2 17:06:31 1996
+***************
+*** 5,14 ****
+  XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp
+  
+! XMLIB = -lXm
+  XCOMM
+! XCOMM for Dell SVR4
+  XCOMM
+! EXTRA_LIBRARIES = -lc -lucb
+  
+  SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c
+  OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o
+--- 5,16 ----
+  XCOMM Imakefile,v 2.0 1994/05/19 02:01:00 dan Exp
+  
+! XMLIB = ${MOTIFLIB}
++ 
+  XCOMM
+! XCOMM The gnuregex library is needed for the Motif file selection box widget.
+  XCOMM
+! XCOMM 
+! EXTRA_LIBRARIES =
+  
+  SRCS = mgdiff.c rundiff.c misc.c files.c spawn.c manual.c modal.c legend.c
+  OBJS = mgdiff.o rundiff.o misc.o files.o spawn.o manual.o modal.o legend.o
diff --git a/textproc/mgdiff/patches/patch-ab b/textproc/mgdiff/patches/patch-ab
new file mode 100644
index 00000000000..764cda27045
--- /dev/null
+++ b/textproc/mgdiff/patches/patch-ab
@@ -0,0 +1,40 @@
+*** mgdiff.c.orig	Thu May 21 21:14:35 1998
+--- mgdiff.c	Thu May 21 21:16:57 1998
+***************
+*** 1110,1116 ****
+  	 */
+      case 3:
+  	if (strcmp (argv[1], "-") == 0) {
+! 	    tempfname = tempnam (NULL, "mgdif");
+  	    str_fnamel = strdup (tempfname);
+  	    str_snamel = strdup (user_filename);
+  	    if (!copy_to_file (stdin, tempfname)) {
+--- 1110,1118 ----
+  	 */
+      case 3:
+  	if (strcmp (argv[1], "-") == 0) {
+! 	    char xxx[20];
+! 	    sprintf(tempfname, "mgdif.XXXXXXXX");
+! 	    close(mkstemp (tempfname));
+  	    str_fnamel = strdup (tempfname);
+  	    str_snamel = strdup (user_filename);
+  	    if (!copy_to_file (stdin, tempfname)) {
+***************
+*** 1131,1137 ****
+  	}
+  
+  	if (strcmp (argv[2], "-") == 0) {
+! 	    tempfname = tempnam (NULL, "mgdif");
+  	    str_fnamer = strdup (tempfname);
+  	    str_snamer = strdup (user_filename);
+  	    if (!copy_to_file (stdin, tempfname)) {
+--- 1133,1141 ----
+  	}
+  
+  	if (strcmp (argv[2], "-") == 0) {
+! 	   char xxx[20];
+!             sprintf(tempfname, "mgdif.XXXXXXXX");
+!             close(mkstemp (tempfname));
+  	    str_fnamer = strdup (tempfname);
+  	    str_snamer = strdup (user_filename);
+  	    if (!copy_to_file (stdin, tempfname)) {
diff --git a/textproc/mgdiff/pkg/COMMENT b/textproc/mgdiff/pkg/COMMENT
new file mode 100644
index 00000000000..0585d67e14d
--- /dev/null
+++ b/textproc/mgdiff/pkg/COMMENT
@@ -0,0 +1 @@
+A graphical front end to the Unix diff command
diff --git a/textproc/mgdiff/pkg/DESCR b/textproc/mgdiff/pkg/DESCR
new file mode 100644
index 00000000000..733f3669d1e
--- /dev/null
+++ b/textproc/mgdiff/pkg/DESCR
@@ -0,0 +1,9 @@
+This is mgdiff, a graphical front end to the Unix diff command based
+upon X11R[456] and the Motif widget set.  It allows the user to select
+two files for comparison, runs the diff command, parses the output and
+presents the results graphically.  This presentation can also be used
+to generate a user-specified merge of the two files into a third file.
+
+This program's appearance is based upon a program called gdiff, which
+runs only on Silicon Graphics workstations and for which source code
+is not provided.
diff --git a/textproc/mgdiff/pkg/MESSAGE b/textproc/mgdiff/pkg/MESSAGE
new file mode 100644
index 00000000000..d48d5420e37
--- /dev/null
+++ b/textproc/mgdiff/pkg/MESSAGE
@@ -0,0 +1,3 @@
+Mgdiff comes with .xbm and .xpm files for use as window
+manager icons. You will find them in ${PREFIX}/lib/X11/mgdiff.
+
diff --git a/textproc/mgdiff/pkg/PLIST b/textproc/mgdiff/pkg/PLIST
new file mode 100644
index 00000000000..851d46092c0
--- /dev/null
+++ b/textproc/mgdiff/pkg/PLIST
@@ -0,0 +1,5 @@
+bin/mgdiff
+man/man1/mgdiff.1
+lib/X11/app-defaults/Mgdiff
+lib/X11/mgdiff/mgdiff.xbm
+lib/X11/mgdiff/mgdiff.xpm