diff --git a/misc/dvorakng/Makefile b/misc/dvorakng/Makefile
index 697f069b9867..31692d076283 100644
--- a/misc/dvorakng/Makefile
+++ b/misc/dvorakng/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	dvorakng
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://www.free.of.pl/n/nopik/
 
@@ -15,20 +16,18 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Dvorak typing tutor
 
 USE_BZIP2=	yes
+USE_GETOPT_LONG=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
+MAKE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500041
-LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
-MAKE_ARGS=	PROF="-I${LOCALBASE}/include ${CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
-		LIBS="-lncurses -lgnugetopt"
-.else
-MAKE_ARGS=	PROF="${CFLAGS}"
-.endif
+DOCS=		README TODO
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dvorakng ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/dvorakng/files/patch-Makefile b/misc/dvorakng/files/patch-Makefile
index 11a5fd11eda0..5401fd370257 100644
--- a/misc/dvorakng/files/patch-Makefile
+++ b/misc/dvorakng/files/patch-Makefile
@@ -1,11 +1,28 @@
---- Makefile.orig	Wed Mar 26 16:27:35 2003
-+++ Makefile	Wed Mar 26 16:27:42 2003
-@@ -11,7 +11,7 @@
- CC       = gcc
- CXX      = g++
+--- Makefile.orig	Mon Mar 17 15:14:42 2003
++++ Makefile	Tue Apr 29 03:00:34 2003
+@@ -8,12 +8,10 @@
+ 
+ ### That's all ###
+ 
+-CC       = gcc
+-CXX      = g++
  PROF     = #-g0 -O2
 -CFLAGS   = $(PROF) -fmessage-length=0 -Wall $(LIMIT_LENGTH)
-+CFLAGS   = $(PROF) -Wall $(LIMIT_LENGTH)
- CXXFLAGS = $(CFLAGS)
- LDFLAGS  = $(PROF)
+-CXXFLAGS = $(CFLAGS)
+-LDFLAGS  = $(PROF)
++CFLAGS	+= $(PROF) -fmessage-length=0 -Wall $(LIMIT_LENGTH)
++CXXFLAGS?= $(CFLAGS)
++LDFLAGS	+= $(PROF)
  LIBS     = -lncurses
+ 
+ OBJECTS  = dvorakng.o lessons.o
+@@ -30,6 +28,9 @@
+ 
+ dvorakng: $(OBJECTS)
+ 	$(CXX) -s $(LDFLAGS) -o $(TARGET) $(OBJECTS) $(LIBS)
++
++.cpp.o:
++	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $>
+ 
+ clean:
+ 		rm -f $(OBJECTS) $(TARGET)
diff --git a/misc/dvorakng/pkg-plist b/misc/dvorakng/pkg-plist
index 80c0034ca6b6..0ce1eeaec193 100644
--- a/misc/dvorakng/pkg-plist
+++ b/misc/dvorakng/pkg-plist
@@ -1 +1,4 @@
 bin/dvorakng
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%