diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 2403852a1183..2f8c31f94d3a 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -2,16 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	mp
-DISTVERSION=	5.31
-PORTREVISION=	1
+DISTVERSION=	5.36
 CATEGORIES=	editors
 MASTER_SITES=	http://triptico.com/download/mp/
 
 MAINTAINER=	jhale@FreeBSD.org
 COMMENT=	Programming text editor
 
-BROKEN=		unfetchable
-
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
@@ -51,12 +48,10 @@ ANSI_CONFIGURE_WITH=	ansi
 GTK2_USES=		gnome pkgconfig
 GTK2_USE=		gnome=cairo,gdkpixbuf2,gtk20
 GTK2_CONFIGURE_ON=	--with-gtk=2
-GTK2_DESKTOP_ENTRIES=	"Minimum Profit" "" "mp" "mp-5" "Utility;TextEditor;GTK;" ""
 
 GTK3_USES=		gnome pkgconfig
 GTK3_USE=		gnome=cairo,gdkpixbuf2,gtk30
 GTK3_CONFIGURE_ON=	--with-gtk=3
-GTK3_DESKTOP_ENTRIES=	"Minimum Profit" "" "mp" "mp-5" "Utility;TextEditor;GTK;" ""
 
 NCURSES_USES=		ncurses
 NCURSES_CONFIGURE_WITH=	curses
@@ -68,11 +63,12 @@ QT5_USE=		cxxstd=-std=c++11 \
 			qt=buildtools_build,core,gui,widgets
 QT5_CONFIGURE_ENV=	CCLINK="${CXX}"
 QT5_CONFIGURE_ON=	--with-qt5 --with-moc="${MOC}"
-QT5_DESKTOP_ENTRIES=	"Minimum Profit" "" "mp" "mp-5" "Utility;TextEditor;Qt;" ""
+QT5_CONFIGURE_OFF=	--without-qt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5}
+USES+=		desktop-file-utils
 PLIST_SUB+=	GUI=""
 .else
 PLIST_SUB+=	GUI="@comment "
@@ -96,7 +92,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mp-5 ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/mp-5.1 ${STAGEDIR}${MANPREFIX}/man/man1
 .if ${PORT_OPTIONS:MGTK*} || ${PORT_OPTIONS:MQT5}
-	${INSTALL_DATA} ${WRKSRC}/mp.png ${STAGEDIR}${PREFIX}/share/pixmaps
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/applications
+	${INSTALL_DATA} ${WRKSRC}/minimum-profit.desktop ${STAGEDIR}${PREFIX}/share/applications
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
+	${INSTALL_DATA} ${WRKSRC}/minimum-profit.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 .endif
 
 do-install-NLS-on:
diff --git a/editors/mp/distinfo b/editors/mp/distinfo
index 3204b36762f4..7312126a2b0a 100644
--- a/editors/mp/distinfo
+++ b/editors/mp/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1552964726
-SHA256 (mp-5.31.tar.gz) = 77126949191800eac7618ecb5664896715c9437061cc4f73b3939cb4f5e20f1e
-SIZE (mp-5.31.tar.gz) = 509436
+TIMESTAMP = 1576212317
+SHA256 (mp-5.36.tar.gz) = 3850838d16d3c6be7902cdd1b7d77c5b4282caa36373ff4a2a88c77cc25ecc96
+SIZE (mp-5.36.tar.gz) = 537723
diff --git a/editors/mp/files/patch-config.sh b/editors/mp/files/patch-config.sh
index e3ee946a7c58..48c4fd42ae5e 100644
--- a/editors/mp/files/patch-config.sh
+++ b/editors/mp/files/patch-config.sh
@@ -1,6 +1,6 @@
---- config.sh.orig	2019-02-15 07:23:10 UTC
+--- config.sh.orig	2019-07-02 05:57:45 UTC
 +++ config.sh
-@@ -38,6 +38,7 @@ while [ $# -gt 0 ] ; do
+@@ -40,6 +40,7 @@ while [ $# -gt 0 ] ; do
      case $1 in
      --without-curses)    WITHOUT_CURSES=1 ;;
      --without-gtk)       WITHOUT_GTK=1 ;;
@@ -8,14 +8,14 @@
      --without-win32)     WITHOUT_WIN32=1 ;;
      --with-kde4)         WITHOUT_KDE4=0 ;;
      --without-qt)        WITHOUT_QT5=1 && WITHOUT_QT4=1 ;;
-@@ -73,6 +74,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then
-     echo "--prefix=PREFIX       Installation prefix ($PREFIX)."
-     echo "--without-curses      Disable curses (text) interface detection."
-     echo "--without-gtk         Disable GTK interface detection."
-+    echo "--with-gtk=GTKVER     Enable GTK where GTKVER=(2|3)."
-     echo "--without-win32       Disable win32 interface detection."
-     echo "--with-kde4           Enable KDE4 interface detection."
-     echo "--without-qt          Disable Qt interface detection."
+@@ -75,6 +76,7 @@ if [ "$CONFIG_HELP" = "1" ] ; then
+     echo "--prefix=PREFIX         Installation prefix ($PREFIX)."
+     echo "--without-curses        Disable curses (text) interface detection."
+     echo "--without-gtk           Disable GTK interface detection."
++    echo "--with-gtk=GTKVER       Enable GTK where GTKVER=(2|3)."
+     echo "--without-win32         Disable win32 interface detection."
+     echo "--with-kde4             Enable KDE4 interface detection."
+     echo "--without-qt            Disable Qt interface detection."
 @@ -250,11 +252,11 @@ echo -n "Testing for ncursesw... "
  if [ "$WITHOUT_CURSES" = "1" ] ; then
      echo "Disabled"
diff --git a/editors/mp/files/patch-mpdm_mpdm__f.c b/editors/mp/files/patch-mpdm_mpdm__f.c
new file mode 100644
index 000000000000..fca15c7f1e8a
--- /dev/null
+++ b/editors/mp/files/patch-mpdm_mpdm__f.c
@@ -0,0 +1,13 @@
+mpdm_f.c:1947:9: error: use of undeclared identifier 'environ'
+        environ = (char **) calloc(sizeof(char *), mpdm_size(v) + 1);
+
+--- mpdm/mpdm_f.c.orig	2019-11-27 07:37:22 UTC
++++ mpdm/mpdm_f.c
+@@ -1944,6 +1944,7 @@ static int sysdep_popen(mpdm_t v, char *prg, int rw)
+ 
+         /* build the environment for the subprocess */
+         v = mpdm_join(mpdm_get_wcs(mpdm_root(), L"ENV"), MPDM_S(L"="));
++        extern char **environ;
+         environ = (char **) calloc(sizeof(char *), mpdm_size(v) + 1);
+ 
+         mpdm_ref(v);
diff --git a/editors/mp/files/patch-mpv__gtk.c b/editors/mp/files/patch-mpv__gtk.c
index 4d0a4ebdd563..01ba7a67240f 100644
--- a/editors/mp/files/patch-mpv__gtk.c
+++ b/editors/mp/files/patch-mpv__gtk.c
@@ -1,14 +1,52 @@
 Fix build with GTK 2.x
-https://github.com/angelortega/mp-5.x/pull/40
+mpv_gtk.c:2386:5: error: use of undeclared identifier 'GdkMonitor'
+    GdkMonitor *monitor;
 
---- mpv_gtk.c.orig	2019-02-26 08:10:09 UTC
+--- mpv_gtk.c.orig	2019-10-24 17:18:37 UTC
 +++ mpv_gtk.c
-@@ -2533,7 +2533,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
-     gtk_box_pack_start(GTK_BOX(vbox), status, FALSE, FALSE, 0);
- 
+@@ -2378,13 +2378,14 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
  #if CONFOPT_GTK == 2
--    gtk_misc_set_alignment(GTK_MISC(label), 0, .5);
-+    gtk_misc_set_alignment(GTK_MISC(status), 0, .5);
+     GdkPixmap *pixmap;
+     GdkPixmap *mask;
++    GdkScreen *screen;
  #endif
  #if CONFOPT_GTK == 3
-     gtk_label_set_xalign(GTK_LABEL(status), 0.0);
+     GdkPixbuf *pixmap;
+-#endif
+     GdkDisplay *display;
+     GdkMonitor *monitor;
+     GdkRectangle monitor_one_size;
++#endif
+     mpdm_t v;
+     int w, h;
+     GtkTargetEntry targets[] = {
+@@ -2399,6 +2400,21 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+     gtk_window_set_title(GTK_WINDOW(window), "mp " VERSION);
+ 
+     /* get real screen and pick a usable size for the main area */
++#if CONFOPT_GTK == 2
++    screen = gtk_window_get_screen(GTK_WINDOW(window));
++    if (gdk_screen_get_n_monitors(screen) > 1) {
++        GdkRectangle monitor_one_size;
++        gdk_screen_get_monitor_geometry(screen, 0, &monitor_one_size);
++
++        w = (monitor_one_size.width * 3) / 4;
++        h = (monitor_one_size.height * 2) / 3;
++    }
++    else {
++        w = (gdk_screen_get_width(screen) * 3) / 4;
++        h = (gdk_screen_get_height(screen) * 2) / 3;
++    }
++#endif
++#if CONFOPT_GTK == 3
+     display = gdk_display_get_default();
+ 
+     monitor = gdk_display_get_monitor(display, 0);
+@@ -2407,6 +2423,7 @@ static mpdm_t gtk_drv_startup(mpdm_t a, mpdm_t ctxt)
+         
+     w = (monitor_one_size.width * 3) / 4;
+     h = (monitor_one_size.height * 2) / 3;
++#endif
+ 
+     v = mpdm_get_wcs(MP, L"state");
+     if ((v = mpdm_get_wcs(v, L"window")) == NULL) {
diff --git a/editors/mp/pkg-plist b/editors/mp/pkg-plist
index e5f62ec0f71a..683851bc9608 100644
--- a/editors/mp/pkg-plist
+++ b/editors/mp/pkg-plist
@@ -1,5 +1,6 @@
 bin/mp-5
 man/man1/mp-5.1.gz
+%%GUI%%share/applications/minimum-profit.desktop
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
@@ -35,10 +36,11 @@ man/man1/mp-5.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_overview.txt
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_quickref.ps
 %%PORTDOCS%%%%DOCSDIR%%/mpsl_quickref.txt
+%%PORTDOCS%%%%DOCSDIR%%/mptxt_format.txt
+%%GUI%%share/icons/hicolor/48x48/apps/minimum-profit.png
 %%NLS%%share/locale/de/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/es/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/it/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/minimum-profit.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/minimum-profit.mo
-%%GUI%%share/pixmaps/mp.png