diff --git a/devel/motor/Makefile b/devel/motor/Makefile
index 95c0e91fda21..66ba0397b30a 100644
--- a/devel/motor/Makefile
+++ b/devel/motor/Makefile
@@ -6,20 +6,22 @@
 #
 
 PORTNAME=	motor
-PORTVERSION=	2.15.7
+PORTVERSION=	2.20.14
 CATEGORIES=	devel
-MASTER_SITES=	http://download.konst.org.ua/ \
-		http://konst.org.ua/download/ \
+MASTER_SITES=	http://konst.org.ua/download/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	sobomax
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext \
+		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+		LDFLAGS="-L${LOCALBASE}/lib -lintl -lgnugetopt"
+
+MAN1=		motor.1
 
 .include <bsd.port.mk>
diff --git a/devel/motor/distinfo b/devel/motor/distinfo
index 03a78bd2f8c8..d504384c272e 100644
--- a/devel/motor/distinfo
+++ b/devel/motor/distinfo
@@ -1 +1 @@
-MD5 (motor-2.15.7.tar.gz) = f5f39813f996ab51e23db0451fef689a
+MD5 (motor-2.20.14.tar.gz) = f42d9066ef6a3cb22462cb2740eb4e19
diff --git a/devel/motor/files/patch-ktools::src::Makefile.in b/devel/motor/files/patch-ktools::src::Makefile.in
deleted file mode 100644
index e46856e60cc6..000000000000
--- a/devel/motor/files/patch-ktools::src::Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- ktools/src/Makefile.in	2001/04/17 13:43:29	1.1
-+++ ktools/src/Makefile.in	2001/04/17 13:43:36
-@@ -88,7 +88,7 @@
- noinst_LIBRARIES = libkonst.a
- libkonst_a_SOURCES = konst.d.cc konst.fs.cc konst.list.cc konst.logic.cc konst.process.cc konst.socket.cc konst.string.cc konst.ui.edit.cc konst.ui.fm.cc konst.ui.func.cc konst.ui.horbar.cc konst.ui.input.cc konst.ui.menu.cc konst.ui.skel.cc konst.ui.text.cc konst.ui.tree.cc konst.ui.window.cc konst.ui.dlg.cc
- EXTRA_DIST = konst.d.cc konst.fs.cc konst.list.cc konst.logic.cc konst.process.cc konst.socket.cc konst.string.cc konst.ui.edit.cc konst.ui.fm.cc konst.ui.func.cc konst.ui.horbar.cc konst.ui.input.cc konst.ui.menu.cc konst.ui.skel.cc konst.ui.text.cc konst.ui.tree.cc konst.ui.window.cc konst.ui.dlg.cc
--CXXFLAGS = -g
-+#CXXFLAGS = -g
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/devel/motor/files/patch-src::Makefile.in b/devel/motor/files/patch-src::Makefile.in
index b2bccb83d771..e7bfd1b8a659 100644
--- a/devel/motor/files/patch-src::Makefile.in
+++ b/devel/motor/files/patch-src::Makefile.in
@@ -1,8 +1,5 @@
-
-$FreeBSD$
-
---- src/Makefile.in.orig	Mon Apr 16 23:04:06 2001
-+++ src/Makefile.in	Tue Apr 17 16:50:15 2001
+--- src/Makefile.in.orig	Thu Jun  7 10:50:20 2001
++++ src/Makefile.in	Fri Aug  3 11:55:15 2001
 @@ -61,6 +61,7 @@
  CATOBJEXT = @CATOBJEXT@
  CC = @CC@
@@ -11,21 +8,12 @@ $FreeBSD$
  DATADIRNAME = @DATADIRNAME@
  GENCAT = @GENCAT@
  GMOFILES = @GMOFILES@
-@@ -85,7 +86,7 @@
- l = @l@
+@@ -87,7 +88,7 @@
+ INCLUDES = -I../include -I../kkstrtext -I../kkconsui/include     -I../kksystr/include -I../parser/include -I$(top_srcdir)/intl
+ 
  
- INCLUDES = -I../include -I../ktools/include -I../parser/include -I$(top_srcdir)/intl
 -CPPFLAGS = -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
 +CPPFLAGS += -DSHARE_DIR=\"$(pkgdatadir)\" -DLOCALE_DIR=\"$(datadir)/locale\"
  
  bin_PROGRAMS = motor
  
-@@ -93,7 +94,7 @@
- 
- 
- motor_LDADD = -lcurses ../parser/src/libparser.a ../ktools/src/libkonst.a @INTLLIBS@ @LIBS@
--CXXFLAGS = -g
-+#CXXFLAGS = -g
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES =