diff --git a/udunits2/Makefile b/udunits2/Makefile
index 43f25bc7a0..2077f9f82d 100644
--- a/udunits2/Makefile
+++ b/udunits2/Makefile
@@ -8,15 +8,9 @@ MAINTAINER=	bacon@NetBSD.org
 COMMENT=	Library for manipulating units of physical quantities
 LICENSE=	modified-bsd
 
-# MAKE_JOBS_SAFE=	no
-
-USE_LIBTOOL=		yes
-# USE_TOOLS=		gmake
-GNU_CONFIGURE=		yes
-INFO_FILES=		yes
-
-# CONFIGURE_ARGS+=	--disable-shared
-# CONFIGURE_ENV+=		ac_cv_header_CUnit_CUnit_h=no
+USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
+INFO_FILES=	yes
 
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/udunits2/TODO b/udunits2/TODO
index b687356e6b..e6f693561a 100644
--- a/udunits2/TODO
+++ b/udunits2/TODO
@@ -1 +1 @@
-Clean up and test
+Upgrade ncview for compatibility with udunits2?