diff --git a/cad/xnecview/Makefile b/cad/xnecview/Makefile
index 4315e9ca53c..eb744729ae8 100644
--- a/cad/xnecview/Makefile
+++ b/cad/xnecview/Makefile
@@ -1,16 +1,15 @@
-# $OpenBSD: Makefile,v 1.26 2019/07/12 20:43:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.27 2020/02/10 10:47:23 benoit Exp $
 
 COMMENT=	NEC2 antenna simulator visualizer
 
-DISTNAME=	xnecview-1.36
-REVISION=	1
+DISTNAME =	xnecview-1.37
 EXTRACT_SUFX=	.tgz
 
-MASTER_SITES=	http://wwwhome.cs.utwente.nl/~ptdeboer/ham/xnecview/
+MASTER_SITES=	https://www.pa3fwm.nl/software/xnecview/
 
 CATEGORIES=	cad hamradio
 
-HOMEPAGE=	http://www.cs.utwente.nl/~ptdeboer/ham/xnecview/
+HOMEPAGE=	https://www.pa3fwm.nl/software/xnecview/
 
 # GPLv2
 PERMIT_PACKAGE=	Yes
@@ -25,6 +24,8 @@ LIB_DEPENDS =		x11/gtk+2
 USE_GMAKE =	Yes
 MAKE_FLAGS =	CC="${CC}" LD="${LD}" myCFLAGS="${CFLAGS}"
 
+DEBUG_PACKAGES =	${BUILD_PACKAGES}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xnecview ${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/xnecview.1x ${PREFIX}/man/man1/xnecview.1
diff --git a/cad/xnecview/distinfo b/cad/xnecview/distinfo
index 1f5fa5820e7..e070014d771 100644
--- a/cad/xnecview/distinfo
+++ b/cad/xnecview/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xnecview-1.36.tgz) = vig3ztsVJrkPhGwyBVA4WMdHFDTGeNzZzoSEFd/XboY=
-SIZE (xnecview-1.36.tgz) = 79535
+SHA256 (xnecview-1.37.tgz) = TizvpYhyYIRaCdRO2rX/l5nV0JGFfPivCppZDPNZUfA=
+SIZE (xnecview-1.37.tgz) = 79005
diff --git a/cad/xnecview/patches/patch-draw_c b/cad/xnecview/patches/patch-draw_c
index 6936d5500de..2da150c5ce9 100644
--- a/cad/xnecview/patches/patch-draw_c
+++ b/cad/xnecview/patches/patch-draw_c
@@ -1,7 +1,8 @@
-$OpenBSD: patch-draw_c,v 1.1 2013/12/06 15:22:40 jca Exp $
---- draw.c.orig	Fri Dec  6 16:21:50 2013
-+++ draw.c	Fri Dec  6 16:21:52 2013
-@@ -616,8 +616,6 @@ void draw_gain_phi(int j,Radpattern *rp)
+$OpenBSD: patch-draw_c,v 1.2 2020/02/10 10:47:24 benoit Exp $
+Index: draw.c
+--- draw.c.orig
++++ draw.c
+@@ -615,8 +615,6 @@ void draw_gain_phi(int j,Radpattern *rp)
  #define R270 (1.5*M_PI)
  #define R360 (2*M_PI)
  
diff --git a/cad/xnecview/patches/patch-xwin_c b/cad/xnecview/patches/patch-xwin_c
index 2469cf44875..e6db74c6319 100644
--- a/cad/xnecview/patches/patch-xwin_c
+++ b/cad/xnecview/patches/patch-xwin_c
@@ -1,9 +1,6 @@
-$OpenBSD: patch-xwin_c,v 1.2 2014/03/22 01:05:45 sthen Exp $
-
-Fix build with png-1.5.
-
---- xwin.c.orig	Mon Jul 25 23:03:37 2011
-+++ xwin.c	Sat Mar 22 01:04:32 2014
+$OpenBSD: patch-xwin_c,v 1.3 2020/02/10 10:47:24 benoit Exp $
+--- xwin.c.orig	Sun Jan 12 15:19:48 2020
++++ xwin.c	Mon Feb 10 11:32:25 2020
 @@ -13,6 +13,7 @@
  #include <math.h>
  #include <stdio.h>
@@ -12,12 +9,3 @@ Fix build with png-1.5.
  #include <gtk/gtk.h>
  #include <gdk/gdkkeysyms.h>
  
-@@ -277,7 +278,7 @@ int write_png(int which,const char *filename)
-       fclose(f);
-       return 1;
-    }
--   if (setjmp(pp->jmpbuf)) {
-+   if (setjmp(png_jmpbuf(pp))) {
-       png_destroy_write_struct(&pp,&ip);
-       fclose(f);
-       gdk_image_destroy(image);