diff --git a/release/packages/Makefile.package b/release/packages/Makefile.package
--- a/release/packages/Makefile.package
+++ b/release/packages/Makefile.package
@@ -181,7 +181,11 @@
 vt_DESC=		VT fonts and keyboard files
 wpa_COMMENT=		802.11 Supplicant
 wpa_DESC=		802.11 Supplicant
-yp_COMMENT=		Yellow Pages programs
-yp_DESC=		Yellow Pages programs
+yp_COMMENT=		Yellow Pages (YP) / Network Information Service (NIS)
+yp_DESC=\
+YP, also called NIS, is a network protocol for sharing name service\n\
+information across machines on a network.  This packages contains the YP\n\
+server, YP management utilities, the YP-LDAP gateway (ypldap), YP client\n\
+utilities and a sample Makefile for building the YP database.
 zfs_COMMENT=		ZFS Libraries and Utilities
 zfs_DESC=		ZFS Libraries and Utilities
diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -18,7 +18,8 @@
 
 local parser = ucl.parser()
 for i = 2, #arg - 2, 2 do
-	parser:register_variable(arg[i - 1], arg[i])
+	local subst = string.gsub(arg[i], "\\n ?", "\n")
+	parser:register_variable(arg[i - 1], subst)
 end
 local res,err = parser:parse_file(arg[#arg - 1])
 if not res then