diff --git a/x11/ly/Makefile b/x11/ly/Makefile
index da2931f6e91e..a338809f2035 100644
--- a/x11/ly/Makefile
+++ b/x11/ly/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	ly
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.5.0
+DISTVERSION=	0.5.2
 CATEGORIES=	x11
 
 MAINTAINER=	nc@FreeBSD.org
 COMMENT=	TUI (ncurses-like) display manager for X and Wayland
 
 LICENSE=	WTFPL
 LICENSE_FILE=	${WRKSRC}/license.md
 
 BUILD_DEPENDS=	ginstall:sysutils/coreutils
 
 USES=		gmake localbase xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	cylgom
 GH_TUPLE=	cylgom:argoat:36c41f09ecc2a10c9acf35e4194e08b6fa10cf45:argoat/sub/argoat \
 		cylgom:testoasterror:71620b47872b5535f87c908883576d73153a6911:testoasterror/sub/argoat/sub/testoasterror \
 		cylgom:configator:8227b3a835bf4c7e50a57e4ad6aff620ba0dc349:configator/sub/configator \
 		cylgom:ctypes:5dd979d3644ab0c85ca14e72b61e6d3d238d432b:ctypes/sub/ctypes \
 		cylgom:dragonfail:6b40d1f8b7f6dda9746e688666af623dfbcceb94:dragonfail/sub/dragonfail \
 		cylgom:termbox_next:2312da153e44face7bb45aa2798ec284289c17ca:termbox_next/sub/termbox_next
 USE_XORG=	xcb
 
 MAKEFILE=	makefile
 MAKE_ARGS=	CC="${CC}" \
 		DISTVERSIONFULL="${DISTVERSIONFULL}"
 ALL_TARGET=	final
 
 BINARY_ALIAS=	install=ginstall
 
 SUB_FILES=	pkg-message
 
 _GITDIR=	${WRKDIR}/${GH_PROJECT}-git
 
 post-patch:
 	# Note to maintainers: patches can be regenerated with
 	# "make clean extract do-patch makepatch" (YMMV).
 	@${REINPLACE_CMD} "s|%%ETCDIR%%|${ETCDIR}|g" ${WRKSRC}/src/config.c
 	@${REINPLACE_CMD} -e "s|%%ETCDIR%%|${ETCDIR}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/res/config.ini
 	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/res/xsetup.sh
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ly
 .for _f in config.ini xsetup.sh wsetup.sh
 	@${MV} ${STAGEDIR}${ETCDIR}/${_f} \
 		${STAGEDIR}${ETCDIR}/${_f}.sample
 .endfor
 
 # Target for maintainers. Use this target to regenerate GH_TUPLE for Git
 # submodules used by the project (and project's dependencies).
 _git-submodules-to-gh-tuple:
 	${RM} -r ${_GITDIR}
 	git clone https://github.com/${GH_ACCOUNT}/${GH_PROJECT} ${_GITDIR}
 	git -C ${_GITDIR} checkout ${GH_TAGNAME}
 	${REINPLACE_CMD} 's/make github/${MAKE_CMD} github/g' ${_GITDIR}/makefile
 	${MAKE_CMD} -C ${_GITDIR} github
 	git -C ${_GITDIR} submodule status --recursive | cut -c 2- | \
 		${AWK} -f ${FILESDIR}/git-submodules-to-gh-tuple.awk
 
 .include <bsd.port.mk>
diff --git a/x11/ly/distinfo b/x11/ly/distinfo
index 139fb7b0eb2c..bb5ca9bd4a31 100644
--- a/x11/ly/distinfo
+++ b/x11/ly/distinfo
@@ -1,15 +1,15 @@
-TIMESTAMP = 1612242690
-SHA256 (cylgom-ly-v0.5.0_GH0.tar.gz) = 5311d77a1f9e5e827adc26e7bdf4a6dadb5ada0fa7d85b451b35231cb6d84b6d
-SIZE (cylgom-ly-v0.5.0_GH0.tar.gz) = 20355
+TIMESTAMP = 1617989260
+SHA256 (cylgom-ly-v0.5.2_GH0.tar.gz) = 3460c2c8015add2946f9ff5d3e4bf051d7c07005698fe61279cedacd1283e010
+SIZE (cylgom-ly-v0.5.2_GH0.tar.gz) = 22535
 SHA256 (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5c284cae748b1cec4eef311845f53ad673f91996ec425c6e323f0c40e829e77f
 SIZE (cylgom-argoat-36c41f09ecc2a10c9acf35e4194e08b6fa10cf45_GH0.tar.gz) = 5497
 SHA256 (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = bffa1100ffbb7d541a16a9a543e216748fe6f6264fd2b9137738cebcf68d3e8c
 SIZE (cylgom-testoasterror-71620b47872b5535f87c908883576d73153a6911_GH0.tar.gz) = 3360
 SHA256 (cylgom-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = bde1826acb80092bd551985082dc872c7f3e48e03132c377f0e5cdd2f9f331e3
 SIZE (cylgom-configator-8227b3a835bf4c7e50a57e4ad6aff620ba0dc349_GH0.tar.gz) = 4501
 SHA256 (cylgom-ctypes-5dd979d3644ab0c85ca14e72b61e6d3d238d432b_GH0.tar.gz) = 778189ee022a0ad97073372681fb92a7b2a1ecc5a242e99b1f23745f084ee3e1
 SIZE (cylgom-ctypes-5dd979d3644ab0c85ca14e72b61e6d3d238d432b_GH0.tar.gz) = 1242
 SHA256 (cylgom-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = c185f739e392313c08b0d5fd27e93891b89c36b7b49b83570b601b9cbfbddae1
 SIZE (cylgom-dragonfail-6b40d1f8b7f6dda9746e688666af623dfbcceb94_GH0.tar.gz) = 3348
 SHA256 (cylgom-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = b788c86e1454c32cd218d0478a87def0a4d1322fef407885359d1ed0c343b045
 SIZE (cylgom-termbox_next-2312da153e44face7bb45aa2798ec284289c17ca_GH0.tar.gz) = 23558
diff --git a/x11/ly/files/patch-makefile b/x11/ly/files/patch-makefile
index b9a706ac6cba..72492e9b6aad 100644
--- a/x11/ly/files/patch-makefile
+++ b/x11/ly/files/patch-makefile
@@ -1,47 +1,49 @@
---- makefile.orig	2020-02-03 07:51:05 UTC
+--- makefile.orig	2020-07-28 15:35:08 UTC
 +++ makefile
 @@ -1,9 +1,9 @@
  NAME = ly
  CC = gcc
  FLAGS = -std=c99 -pedantic -g
 -FLAGS+= -Wall -Wextra -Werror=vla -Wno-unused-parameter
 +FLAGS+= -Wall -Wextra -Wno-unused-parameter
  #FLAGS+= -DDEBUG
 -FLAGS+= -DGIT_VERSION_STRING=\"$(shell git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g')\"
 +FLAGS+= -DGIT_VERSION_STRING=\"${DISTVERSIONFULL}\"
  LINK = -lpam -lxcb
  VALGRIND = --show-leak-kinds=all --track-origins=yes --leak-check=full --suppressions=../res/valgrind.supp
  CMD = ./$(NAME)
 @@ -12,6 +12,10 @@ OS:= $(shell uname -s)
  ifeq ($(OS), Linux)
  	FLAGS+= -D_DEFAULT_SOURCE
  endif
 +ifeq ($(OS), FreeBSD)
 +	FLAGS+= -D_DEFAULT_SOURCE ${CPPFLAGS} ${CFLAGS}
 +	LINK+=	${LIBS}
 +endif
  
  BIND = bin
  OBJD = obj
-@@ -71,14 +75,13 @@ leakgrind: $(BIND)/$(NAME)
+@@ -71,15 +75,14 @@ leakgrind: $(BIND)/$(NAME)
  
  install: $(BIND)/$(NAME)
  	@echo "installing"
 -	@install -dZ ${DESTDIR}/etc/ly
 -	@install -DZ $(BIND)/$(NAME) -t ${DESTDIR}/usr/bin
 -	@install -DZ $(RESD)/config.ini -t ${DESTDIR}/etc/ly
 -	@install -DZ $(RESD)/xsetup.sh -t $(DATADIR)
 -	@install -DZ $(RESD)/wsetup.sh -t $(DATADIR)
 -	@install -dZ $(DATADIR)/lang
 -	@install -DZ $(RESD)/lang/* -t $(DATADIR)/lang
--	@install -DZ $(RESD)/ly.service -t ${DESTDIR}/usr/lib/systemd/system
+-	@install -DZ $(RESD)/ly.service -m 644 -t ${DESTDIR}/usr/lib/systemd/system
+-	@install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}/etc/pam.d
 +	@install -dZ ${DESTDIR}${PREFIX}/etc/ly
 +	@install -DZ $(BIND)/$(NAME) -t ${DESTDIR}${PREFIX}/bin
 +	@install -DZ $(RESD)/config.ini -t ${DESTDIR}${PREFIX}/etc/ly
 +	@install -DZ $(RESD)/xsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly
 +	@install -DZ $(RESD)/wsetup.sh -t ${DESTDIR}${PREFIX}/etc/ly
 +	@install -dZ ${DESTDIR}${PREFIX}/etc/ly/lang
 +	@install -DZ $(RESD)/lang/* -t ${DESTDIR}${PREFIX}/etc/ly/lang
++	@install -DZ $(RESD)/pam.d/ly -m 644 -t ${DESTDIR}${PREFIX}/etc/pam.d
  
  installnoconf: $(BIND)/$(NAME)
  	@echo "installing without the configuration file"
diff --git a/x11/ly/files/patch-res_config.ini b/x11/ly/files/patch-res_config.ini
index 36c9c6df22ef..90f0c60ed8f4 100644
--- a/x11/ly/files/patch-res_config.ini
+++ b/x11/ly/files/patch-res_config.ini
@@ -1,71 +1,72 @@
---- res/config.ini.orig	2020-02-02 23:51:05.000000000 -0800
-+++ res/config.ini	2021-02-02 19:37:58.212398000 -0800
+--- res/config.ini.orig	2020-07-28 15:35:08 UTC
++++ res/config.ini
 @@ -1,3 +1,5 @@
 +# This is a FreeBSD-ready patched version of the upstream configuration file.
 +
  # animation enabled
  #animate = false
  #animate = true
-@@ -52,12 +54,14 @@
+@@ -53,12 +55,14 @@
  
  # cookie generator
  #mcookie_cmd = /usr/bin/mcookie
 +mcookie_cmd = /usr/bin/openssl rand -hex 16
  
  # event timeout in milliseconds
  #min_refresh_delta = 5
  
  # default path
- #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin
+ #path = /sbin:/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin
 +path = /sbin:/bin:%%LOCALBASE%%/sbin:%%LOCALBASE%%/bin:/usr/sbin:/usr/bin:/usr/bin/env
  
  # command executed when pressing F2
  #restart_cmd = /sbin/shutdown -r now
-@@ -67,12 +71,14 @@
+@@ -68,12 +72,14 @@
  
  # file in which to save and load the default desktop and login
  #save_file = /etc/ly/save
 +save_file = %%ETCDIR%%/save
  
- # service name (pam needs this set to login)
- #service_name = login
+ # service name (set to ly to use the provided pam config file)
+ #service_name = ly
  
  # command executed when pressing F1
  #shutdown_cmd = /sbin/shutdown -a now
 +shutdown_cmd = /sbin/shutdown -p now
  
  # terminal reset command (tput is faster)
  #term_reset_cmd = /usr/bin/tput reset
-@@ -80,23 +86,32 @@
+@@ -81,8 +87,12 @@
  # tty in use
  #tty = 2
  
 +# vt in use by X or Wayland
 +#vt = 9
 +
  # wayland setup command
  #wayland_cmd = /etc/ly/wsetup.sh
 +wayland_cmd = %%ETCDIR%%/wsetup.sh
  
  # add wayland specifier to session names
  #wayland_specifier = false
+@@ -90,15 +100,20 @@
  
  # wayland desktop environments
  #waylandsessions = /usr/share/wayland-sessions
 +waylandsessions = %%LOCALBASE%%/share/wayland-sessions
  
  # xorg server command
  #x_cmd = /usr/bin/X
 +x_cmd = %%LOCALBASE%%/bin/X
  
  # xorg setup command
  #x_cmd_setup = /etc/ly/xsetup.sh
 +x_cmd_setup = %%ETCDIR%%/xsetup.sh
  
  # xorg xauthority edition tool
  #xauth_cmd = /usr/bin/xauth
 +xauth_cmd = %%LOCALBASE%%/bin/xauth
  
  # xorg desktop environments
  #xsessions = /usr/share/xsessions
 +xsessions = %%LOCALBASE%%/share/xsessions
diff --git a/x11/ly/pkg-plist b/x11/ly/pkg-plist
index 688781f4df32..db7f95e0f2c4 100644
--- a/x11/ly/pkg-plist
+++ b/x11/ly/pkg-plist
@@ -1,7 +1,12 @@
 bin/ly
-@sample %%ETCDIR%%/config.ini.sample
+@dir %%ETCDIR%%/lang
 %%ETCDIR%%/lang/en.ini
 %%ETCDIR%%/lang/es.ini
 %%ETCDIR%%/lang/fr.ini
+%%ETCDIR%%/lang/pt.ini
+%%ETCDIR%%/lang/ro.ini
+%%ETCDIR%%/lang/ru.ini
+@sample %%ETCDIR%%/config.ini.sample
 @sample %%ETCDIR%%/wsetup.sh.sample
 @sample %%ETCDIR%%/xsetup.sh.sample
+etc/pam.d/ly