diff --git a/MOVED b/MOVED
index 5a152c4534af..8e45b43c85a4 100644
--- a/MOVED
+++ b/MOVED
@@ -15802,3 +15802,4 @@ devel/glslang|graphics/glslang|2020-12-23|Moved to a better category, aligning w
 devel/spirv-tools|graphics/spirv-tools|2020-12-25|Moved to a better category, aligning with glslang and shaderc
 sysutils/basu|devel/basu|2020-12-25|Moved to a better category, aligning with dbus
 audio/modplugplay|audio/modplug-tools|2020-12-27|Moved to GitHub under a different name
+www/py-flexget|www/flexget|2020-12-28|Dropped py- prefix due to be a standalone application
diff --git a/UPDATING b/UPDATING
index 8e1e5077aaaa..f04369c1a7ec 100644
--- a/UPDATING
+++ b/UPDATING
@@ -5,6 +5,20 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20201228:
+  AFFECTS: www/py-flexget
+  AUTHOR: jbeich@FreeBSD.org
+
+  py-flexget (or py37-flexget) has been renamed to flexget.
+  "pkg upgrade" doesn't track MOVED file unlike portmaster, so
+  provide a hint e.g.,
+
+    $ pkg upgrade -x flexget
+
+  or install again, letting pkg remove the old version
+
+    $ pkg install flexget
+
 20201218:
   AFFECTS: users of www/qt5-webengine
   AUTHOR: kai@FreeBSD.org
diff --git a/www/Makefile b/www/Makefile
index 25c13a796c90..01cdf9fec0eb 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -165,6 +165,7 @@
     SUBDIR += firefox-esr
     SUBDIR += flashplayer
     SUBDIR += flat-frog
+    SUBDIR += flexget
     SUBDIR += flickcurl
     SUBDIR += fnord
     SUBDIR += formication
@@ -1616,7 +1617,6 @@
     SUBDIR += py-flask-sockets
     SUBDIR += py-flask-uploads
     SUBDIR += py-flask-wtf
-    SUBDIR += py-flexget
     SUBDIR += py-flup6
     SUBDIR += py-folium
     SUBDIR += py-forcediphttpsadapter
@@ -2128,6 +2128,7 @@
     SUBDIR += serendipity
     SUBDIR += serf
     SUBDIR += servlet-api
+    SUBDIR += servo
     SUBDIR += sfeed
     SUBDIR += sfnt2woff
     SUBDIR += shellinabox
diff --git a/www/py-flexget/Makefile b/www/flexget/Makefile
similarity index 93%
rename from www/py-flexget/Makefile
rename to www/flexget/Makefile
index 1179eb4be896..25f6f99565fe 100644
--- a/www/py-flexget/Makefile
+++ b/www/flexget/Makefile
@@ -1,15 +1,12 @@
-# Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	flexget
 DISTVERSIONPREFIX=	v
 PORTVERSION=	3.1.80
-PORTEPOCH=	1
-CATEGORIES=	www python
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+CATEGORIES=	www
 
 MAINTAINER=	jbeich@FreeBSD.org
-COMMENT=	Program to automate downloading from different sources
+COMMENT=	Multipurpose automation tool for all of your media
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -48,12 +45,11 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=3.3:devel/py-pytest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}vcrpy>0:devel/py-vcrpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}boto3>0:www/py-boto3@${PY_FLAVOR}
 
-USE_GITHUB=	yes
-GH_PROJECT=	Flexget
-
-NO_ARCH=	yes
 USES=		python:3.6+
+USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
+GH_PROJECT=	Flexget
+NO_ARCH=	yes
 
 post-extract:
 # Unlock dependencies' versions
diff --git a/www/py-flexget/distinfo b/www/flexget/distinfo
similarity index 100%
rename from www/py-flexget/distinfo
rename to www/flexget/distinfo
diff --git a/www/py-flexget/files/patch-requirements.txt b/www/flexget/files/patch-requirements.txt
similarity index 100%
rename from www/py-flexget/files/patch-requirements.txt
rename to www/flexget/files/patch-requirements.txt
diff --git a/www/flexget/pkg-descr b/www/flexget/pkg-descr
new file mode 100644
index 000000000000..79962bcfbb72
--- /dev/null
+++ b/www/flexget/pkg-descr
@@ -0,0 +1,7 @@
+FlexGet is a multipurpose automation tool for content like torrents,
+nzbs, podcasts, comics, series, movies, etc. It can use different
+kinds of sources like RSS-feeds, html pages, csv files, search engines
+and there are even plugins for sites that do not provide any kind of
+useful feeds.
+
+WWW: https://flexget.com/
diff --git a/www/py-flexget/pkg-descr b/www/py-flexget/pkg-descr
deleted file mode 100644
index 7d3edc5b37e0..000000000000
--- a/www/py-flexget/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-FlexGet is a multipurpose automation tool for content like torrents,
-nzbs, podcasts, comics, etc. FlexGet is able to handle different
-kinds of sources like RSS-feeds, html pages and even csv files.
-There are even some plugins for sites that do not provide any kind
-of useful feeds.
-
-There are numerous plugins that allow utilizing FlexGet in interesting
-ways and more are being added continuously. FlexGet is extremely
-useful in conjunction with applications which have watch directory
-support.
-
-For example, it works with the following applications:
-- BitTorrent: rTorrent, uTorrent, Transmission and Deluge
-- Usenet: nzbget, sabnzb and hellanzb
-
-WWW: https://flexget.com/