diff --git a/lang/lfe/Makefile b/lang/lfe/Makefile
index e9a2290d8295..e2af914b8189 100644
--- a/lang/lfe/Makefile
+++ b/lang/lfe/Makefile
@@ -1,45 +1,51 @@
 PORTNAME=	lfe
-PORTVERSION=	1.3
+PORTVERSION=	2.1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	lang
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Lisp Flavored Erlang
 WWW=		https://lfe.io
 
 LICENSE=	APACHE20
 
 USES=		erlang gmake
 USE_GITHUB=	yes
 GH_ACCOUNT=	rvirding
 ALL_TARGET=	compile
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
 do-build:
 	cd ${BUILD_WRKSRC} && \
 	    ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET}
 
-post-install:
+pre-install:
 	@${MKDIR} ${STAGEDIR}${ERL_APP_ROOT}/bin
-.for FILE in lfe lfec lfedoc lfescript
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${FILE} ${STAGEDIR}${ERL_APP_ROOT}/bin
-	${LN} -sf ${ERL_APP_ROOT:S,^${PREFIX}/,,:S,^,../,}/bin/${FILE} \
+
+post-install: post-install-bin \
+    post-install-man1 post-install-man3 post-install-man7
+
+post-install-bin:
+.for F in lfe lfec lfedoc lfescript
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/$F ${STAGEDIR}${ERL_APP_ROOT}/bin
+	${LN} -sf ${ERL_APP_ROOT:S,^${PREFIX}/,,:S,^,../,}/bin/$F \
 	    ${STAGEDIR}${PREFIX}/bin
 .endfor
-.for FILE in lfe.1 lfescript.1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/${FILE} \
+
+post-install-man1:
+	cd ${WRKSRC}/doc/man && \
+	    ${INSTALL_MAN} lfe.1 lfescript.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1
-.endfor
-.for FILE in lfe_lib.3 lfe_doc.3 lfe_clj.3 lfe_cl.3 lfe_gen.3 \
-	lfe_io.3 lfe_macro.3 lfe_comp.3 lfe_bits.3
-	${INSTALL_MAN} ${WRKSRC}/doc/man/${FILE} \
+post-install-man3:
+	cd ${WRKSRC}/doc/man && \
+	    ${INSTALL_MAN} lfe_bits.3 lfe_cl.3 lfe_clj.3 lfe_comp.3 \
+		lfe_docs.3 lfe_gen.3 lfe_io.3 lfe_lib.3 lfe_macro.3 \
 		${STAGEDIR}${MAN1PREFIX}/man/man3
-.endfor
-.for FILE in lfe_guide.7 lfe_types.7
-	${INSTALL_MAN} ${WRKSRC}/doc/man/${FILE} \
+post-install-man7:
+	cd ${WRKSRC}/doc/man && \
+	    ${INSTALL_MAN} lfe_guide.7 lfe_types.7 \
 		${STAGEDIR}${MAN1PREFIX}/man/man7
-.endfor
 
 .include <bsd.port.mk>
diff --git a/lang/lfe/distinfo b/lang/lfe/distinfo
index 268282f12a1b..221e92e456b6 100644
--- a/lang/lfe/distinfo
+++ b/lang/lfe/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1504794966
-SHA256 (rvirding-lfe-v1.3_GH0.tar.gz) = 1946c0df595ae49ac33fe583f359812dec6349da6acf43c1458534de3267036b
-SIZE (rvirding-lfe-v1.3_GH0.tar.gz) = 333045
+TIMESTAMP = 1673113389
+SHA256 (rvirding-lfe-v2.1.1_GH0.tar.gz) = e5abacd57dc2f357dda46d8336a40046be806f5c6776f95612676c4b45f6d56b
+SIZE (rvirding-lfe-v2.1.1_GH0.tar.gz) = 362597
diff --git a/lang/lfe/files/patch-Makefile b/lang/lfe/files/patch-Makefile
deleted file mode 100644
index 09f35334c44b..000000000000
--- a/lang/lfe/files/patch-Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.orig	2017-09-07 14:59:29 UTC
-+++ Makefile
-@@ -117,10 +117,9 @@ comp_opts.mk:
- 
- -include comp_opts.mk
- 
--$(BINDIR)/lfe%:
--	$(INSTALL_BIN) $@ $(DESTBINDIR)
-+install: compile install-beam install-bin install-man
- 
--install: compile install-man
-+install-beam:
- 	rm -Rf $(DESTEBINDIR)
- 	$(INSTALL_DIR) $(DESTEBINDIR)
- 	$(INSTALL_DATA) $(EBINDIR)/$(APP_DEF) $(DESTEBINDIR)
diff --git a/lang/lfe/pkg-plist b/lang/lfe/pkg-plist
index c2621ee880b1..73a2ac149bbe 100644
--- a/lang/lfe/pkg-plist
+++ b/lang/lfe/pkg-plist
@@ -1,97 +1,110 @@
 bin/lfe
 bin/lfec
 bin/lfedoc
 bin/lfescript
 lib/erlang/lib/lfe-%%VERSION%%/bin/lfe
 lib/erlang/lib/lfe-%%VERSION%%/bin/lfec
 lib/erlang/lib/lfe-%%VERSION%%/bin/lfedoc
 lib/erlang/lib/lfe-%%VERSION%%/bin/lfescript
 lib/erlang/lib/lfe-%%VERSION%%/ebin/cl.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/clj.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.app
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_abstract_code.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_bits.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_codegen.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_codelift.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_comp.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_doc.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_docs.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_edlin_expand.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_env.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_eval_bits.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_eval.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_gen.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_init.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_internal.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_format.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_pretty.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io_write.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_io.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_lib.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_lint.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_export.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_include.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_record.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro_struct.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_macro.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_ms.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_parse.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_pmod.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_qlc.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_scan.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_shell_docs.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_shell.beam
-lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_trans.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_struct.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_translate.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe_types.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.app
+lib/erlang/lib/lfe-%%VERSION%%/ebin/lfe.beam
 lib/erlang/lib/lfe-%%VERSION%%/ebin/lfescript.beam
+lib/erlang/lib/lfe-%%VERSION%%/ebin/scm.beam
 lib/erlang/lib/lfe-%%VERSION%%/include/cl.lfe
 lib/erlang/lib/lfe-%%VERSION%%/include/clj.lfe
 lib/erlang/lib/lfe-%%VERSION%%/include/match-spec.lfe
+lib/erlang/lib/lfe-%%VERSION%%/include/scm.lfe
 lib/erlang/lib/lfe-%%VERSION%%/src/ChangeLog
-lib/erlang/lib/lfe-%%VERSION%%/src/NOTES
 lib/erlang/lib/lfe-%%VERSION%%/src/cl.lfe
 lib/erlang/lib/lfe-%%VERSION%%/src/clj.lfe
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe.app.src
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe.hrl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_abstract_code.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_bits.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_codegen.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_codelift.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_comp.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_comp.hrl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_doc.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_doc.hrl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_docs.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_docs.hrl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_edlin_expand.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_env.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_eval_bits.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_eval.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_gen.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_init.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_internal.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_format.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_pretty.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io_write.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_io.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_lib.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_lint.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.hrl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_export.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_include.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_record.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro_struct.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_macro.hrl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_ms.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_parse.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_parse.spell1
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_pmod.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_qlc.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_scan.xrl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_shell_docs.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_shell.erl
-lib/erlang/lib/lfe-%%VERSION%%/src/lfe_trans.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_struct.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe_translate.erl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfe_types.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe.app.src
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/lfe.hrl
 lib/erlang/lib/lfe-%%VERSION%%/src/lfescript.erl
+lib/erlang/lib/lfe-%%VERSION%%/src/NOTES
+lib/erlang/lib/lfe-%%VERSION%%/src/scm.erl
 man/man1/lfe.1.gz
 man/man1/lfescript.1.gz
 man/man3/lfe_bits.3.gz
 man/man3/lfe_cl.3.gz
 man/man3/lfe_clj.3.gz
 man/man3/lfe_comp.3.gz
-man/man3/lfe_doc.3.gz
+man/man3/lfe_docs.3.gz
 man/man3/lfe_gen.3.gz
 man/man3/lfe_io.3.gz
 man/man3/lfe_lib.3.gz
 man/man3/lfe_macro.3.gz
 man/man7/lfe_guide.7.gz
 man/man7/lfe_types.7.gz