diff --git a/main/ser2net/APKBUILD b/main/ser2net/APKBUILD
index 3e0ad3929b4..7766b2175ef 100644
--- a/main/ser2net/APKBUILD
+++ b/main/ser2net/APKBUILD
@@ -1,25 +1,20 @@
 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ser2net
-pkgver=3.5.1
-pkgrel=4
+pkgver=4.6.4
+pkgrel=0
 pkgdesc="A proxy that allows telnet/tcp connections to be made to serial ports"
-url="https://sourceforge.net/projects/ser2net/"
+url="https://github.com/cminyard/ser2net"
 arch="all"
 license="LGPL-2.1-only AND GPL-2.0-only"
-makedepends="$depends_dev linux-headers"
+makedepends="linux-headers gensio-dev yaml-dev"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="https://sourceforge.net/projects/ser2net/files/ser2net/ser2net-$pkgver.tar.gz
+source="https://github.com/cminyard/ser2net/releases/download/v$pkgver/ser2net-$pkgver.tar.gz
 	$pkgname.confd
 	$pkgname.initd
 "
 options="!check"
 
-prepare() {
- 	default_prepare
-	update_config_sub
-}
-
 build() {
 	./configure \
 		--build=$CBUILD \
@@ -36,9 +31,11 @@ package() {
 	make DESTDIR="$pkgdir" install
 	install -D -m755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
-	install -D -m644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
+	install -D -m644 $pkgname.yaml "$pkgdir"/etc/$pkgname/$pkgname.yaml
 }
 
-sha512sums="5d052c84faa6172d94d616026b0a96f0c479b2c5d0571e6016d39097a877b2bb77e68fa792d957368d3339083d7cc5bd0bd18669ca37dfc9ddd4620d427e207b  ser2net-3.5.1.tar.gz
-15054f7aa604f93bd5a54c2bb96c9a3168905be5ace50bcd2ebeeaf9dc9ae19426388e6118e9e4850125349090ee29542c24487e64c349593a76366be4a5e501  ser2net.confd
-2b8dc01055222743398fc8ea6bf66b3aabc92661522284c8669d8114a32d376c03038e33fc9802c1cf93290a4ac4f07a4ca806056b98d1ecaff3cbc2614d3b7b  ser2net.initd"
+sha512sums="
+51dd555088fb42ecddc0b838e7f06e46331ec7e39c0177c2ffdce02101bea1bd39af1f53c35b010bece9c5ebb4a213791a85cf736dca0a60edc3f7c11cf165bd  ser2net-4.6.4.tar.gz
+0a03fecc44c2b1cf4208914d2e4cea407d494caa0461fdfe95f6a3fdeaa3dbcec84d7537062e0c4261621f8720f31013262963b4764e41088200984f5e6222cf  ser2net.confd
+7e4f7e2c7c54ef194741ad78b3b0a1358107241f6352d6e3cc0f7bfdfe3042d4dfbddb165d729aafda41de5ec56e2760ae9727707d91d4d1be720511e2e561b3  ser2net.initd
+"
diff --git a/main/ser2net/ser2net.confd b/main/ser2net/ser2net.confd
index c6668515934..a443ce752a7 100644
--- a/main/ser2net/ser2net.confd
+++ b/main/ser2net/ser2net.confd
@@ -1,8 +1,8 @@
 # Config file for /etc/init.d/ser2net
 
-# Set the configuration file to one other than the default of /etc/ser2net.conf
+# Set the configuration file to one other than the default of /etc/ser2net/ser2net.yaml
 #
-#CONFIG_FILE="/etc/ser2net.conf"
+#CONFIG_FILE="/etc/ser2net/ser2net.yaml"
 
 # Enables the control port and sets the TCP port to listen to for the control port.
 # A port number may be of the form [host,]port, such as 127.0.0.1,2000 or localhost,2000.
@@ -11,12 +11,6 @@
 #
 #CONTROL_PORT=""
 
-# Cisco IOS uses a different mechanism for specifying the baud rates than the mechanism
-# described in RFC2217. This option sets the IOS version of setting the baud rates.
-# The default is RFC2217s.
-#
-#CISCO_IOS="yes"
-
 # Enable or disable UUCP locking (default=yes)
 #
 #UUCP_LOCKS="no"
diff --git a/main/ser2net/ser2net.initd b/main/ser2net/ser2net.initd
index 8505f0dbc92..0321e8a9bbb 100644
--- a/main/ser2net/ser2net.initd
+++ b/main/ser2net/ser2net.initd
@@ -1,55 +1,37 @@
 #!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/ser2net/files/ser2net.initd,v 1.4 2012/07/17 19:44:24 sbriesen Exp $
 
 description="Serial to network proxy (${RC_SVCNAME#*.})"
 pidfile="/var/run/${RC_SVCNAME}.pid"
 command="/usr/sbin/ser2net"
-name="${RC_SVCNAME}"
+name="${description}"
 
 extra_started_commands="reload"
 description_reload="Reread configuration file and make the appropriate changes"
-start_stop_daemon_args="--quiet --exec ${command} --name ${name} --pidfile ${pidfile}"
+start_stop_daemon_args="--quiet"
+command_args_background="-P ${pidfile}"
+command_args_foreground="-n"
 
 depend() {
 	use logger
 	need net
 }
 
-config_check() {
+start_pre() {
 	command_args="${EXTRA_OPTS}"
-	CONFIG_FILE_DEFAULT="/etc/ser2net.conf"
+	CONFIG_FILE_DEFAULT="/etc/ser2net/ser2net.yaml"
 
-	yesno "${CISCO_IOS:-no}" && command_args="${SER2NET_OPTS} -b"
 	yesno "${UUCP_LOCKS:-yes}" || command_args="${command_args} -u"
-	[ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}"
 	[ -n "${CONTROL_PORT}" ] && command_args="${command_args} -p ${CONTROL_PORT}"
+	[ -z "${CONFIG_FILE}" ] && CONFIG_FILE="${CONFIG_FILE_DEFAULT}"
 	[ "${CONFIG_FILE}" != "${CONFIG_FILE_DEFAULT}" ] && command_args="${command_args} -c ${CONFIG_FILE}"
 
-	if [ ! -f "${CONFIG_FILE}" ]; then
-		eerror "Please create ${CONFIG_FILE}"
-		eerror "Sample conf: ${CONFIG_FILE_DEFAULT}.dist"
-		return 1
-	fi
 	return 0
 }
 
-start() {
-	config_check || return ${?}
-	ebegin "Starting ${description}"
-	start-stop-daemon --start ${start_stop_daemon_args} -- ${command_args} -P "${pidfile}"
-	eend ${?}
-}
-
-stop() {
-	ebegin "Stopping ${description}"
-	start-stop-daemon --stop ${start_stop_daemon_args}
-	eend ${?}
-}
-
 reload() {
 	ebegin "Reloading ${description}"
-	start-stop-daemon --signal HUP ${start_stop_daemon_args}
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
 	eend ${?}
 }