diff --git a/pelicanconf.py b/pelicanconf.py
index 4ab7606..467024e 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -10,9 +10,6 @@ AUTHOR = "LEdoian"
 SITENAME = "LEdoian's Blog"
 SITE_DESCRIPTION = "My personal webpage" # NOTE: Theme-specific
 
-# FIXME: Ugly hack, write a plugin instead!
-GENERATOR = "Pelican "+pelican.__version__ # NOTE: Theme-specific
-
 SITEURL = 'https://blog.ledoian.cz/'
 RELATIVE_URLS = True
 
@@ -27,6 +24,8 @@ JINJA_ENVIRONMENT = {
 	'keep_trailing_newline': True,
 	}
 
+PLUGINS = ['plugins.pelicanversion']
+
 TIMEZONE = 'Europe/Prague'
 
 DEFAULT_LANG = 'en'
diff --git a/plugins/pelicanversion.py b/plugins/pelicanversion.py
new file mode 100644
index 0000000..2181d29
--- /dev/null
+++ b/plugins/pelicanversion.py
@@ -0,0 +1,13 @@
+import pelican
+
+class PelicanVersionGenerator(pelican.generators.Generator):
+	def generate_context(self):
+		version = f"Pelican {pelican.__version__}"
+		self.context['GENERATOR'] = version
+
+
+def get_generators(_peli):
+	return PelicanVersionGenerator
+
+def register():
+	pelican.signals.get_generators.connect(get_generators)