diff --git a/sysutils/di/Makefile b/sysutils/di/Makefile
index f2d528977209..e76aab1e39c0 100644
--- a/sysutils/di/Makefile
+++ b/sysutils/di/Makefile
@@ -1,30 +1,25 @@
 # Created by: Brad Lanam <bll@gentoo.com>
 # $FreeBSD$
 
 PORTNAME=	di
 PORTVERSION=	4.35
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.gentoo.com/di/ \
 		http://www.cyberbotx.com/di/
 
 MAINTAINER=	cyberbotx@cyberbotx.com
 COMMENT=	Disk Information Utility
 
 MAKE_ENV+=	prefix="${PREFIX}"
 
 OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB=	NLS=""
-.else
-PLIST_SUB=	NLS="@comment "
-MAKE_ENV+=	DI_NO_NLS=T
-.endif
+NLS_USES=	gettext
+NLS_MAKE_ENV_OFF=	DI_NO_NLS=T
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/C/di.c
 
 .include <bsd.port.mk>
diff --git a/sysutils/di/files/patch-Makefile b/sysutils/di/files/patch-Makefile
index bc31bd9e9b9f..934cc3c12943 100644
--- a/sysutils/di/files/patch-Makefile
+++ b/sysutils/di/files/patch-Makefile
@@ -1,26 +1,35 @@
---- Makefile.orig	2014-02-15 12:14:49.000000000 -0500
-+++ Makefile	2014-03-03 16:00:53.000000000 -0500
+--- ./Makefile.orig	2014-02-15 12:14:49.000000000 -0500
++++ ./Makefile	2014-03-31 20:03:46.000000000 -0400
 @@ -36,12 +36,12 @@
  ###
  # installation options
  #
 -prefix = /usr/local
 +prefix ?= /usr/local
  LOCALEDIR = $(prefix)/share/locale
  PROG = di
  MPROG = mi
  #
 -INSTALL_DIR = $(prefix)
 +INSTALL_DIR = $(DESTDIR)$(prefix)
  INSTALL_BIN_DIR = $(INSTALL_DIR)/bin
  INST_LOCALEDIR = $(INSTALL_DIR)/share/locale
  TARGET = $(INSTALL_BIN_DIR)/$(PROG)$(EXE_EXT)
 @@ -58,7 +58,7 @@
  #
  # simple man page installation
  #
 -DI_MANINSTDIR = $(INSTALL_DIR)/share/man
 +DI_MANINSTDIR = $(INSTALL_DIR)/man
  DI_MANDIR = $(DI_MANINSTDIR)/man1
  MAN_TARGET = $(PROG).1
  MANPERM = 644
+@@ -140,7 +140,7 @@
+ 	$(TEST) -d $(INSTALL_BIN_DIR) || $(MKDIR) $(INSTALL_BIN_DIR)
+ 	$(CP) -f ./$(FROMDIR)/$(PROG)$(EXE_EXT) $(TARGET)
+ 	-$(RM) -f $(MTARGET) > /dev/null 2>&1
+-	-$(LN) -s $(PROG)$(EXE_EXT) $(MTARGET)
++	-( cd $(INSTALL_BIN_DIR) && $(LN) -s $(PROG)$(EXE_EXT) $(MPROG)$(EXE_EXT) )
+ 	@-test -f $(FROMDIR)/config.h && \
+ 		grep '^#define _enable_nls 1' $(FROMDIR)/config.h >/dev/null 2>&1 && \
+ 		(. ./$(FROMDIR)/di.env; $(MAKE) -e INST_LOCALEDIR="$(INST_LOCALEDIR)" \