diff --git a/hostname-wordlist/README b/hostname-wordlist/README
index 4be6951ae6..1f65581445 100644
--- a/hostname-wordlist/README
+++ b/hostname-wordlist/README
@@ -56,14 +56,13 @@ Origin
 ------
 
 Compiled for systemd from common vocabulary and standardized names rather than
-imported from an existing word list.
+imported from existing compilations.
 
-    weather  Everyday English weather adjectives
-    colors   Basic English color names
-    worlds   The planets, moons and minor bodies of the solar system
+    weather  Weather adjectives
+    colors   Color names
+    worlds   Stars, planets, moons, minor bodies of the solar system, other mythical and real locations
 
 The lists are deliberately short: they are picked for being easy to recognize,
-read out over the phone and type from memory, while the '?' wildcards carry the
-entropy.
+read out over the phone and type from memory.
 
-The wordlists are licensed under MIT-0.
+The lists are licensed under MIT-0.
diff --git a/hostname-wordlist/colors b/hostname-wordlist/colors
index 4856ec76a8..842393ec8b 100644
--- a/hostname-wordlist/colors
+++ b/hostname-wordlist/colors
@@ -1,42 +1,160 @@
 # SPDX-License-Identifier: MIT-0
+alabaster
 amber
+amethyst
+apricot
+aqua
+auburn
 azure
 beige
 black
 blue
+blush
+brass
+brick
 bronze
 brown
+brownish
+burgundy
+buttercup
+caramel
+carmine
+cedar
+celadon
+cerulean
+charcoal
+chartreuse
+cherry
+chestnut
+chocolate
+cinnabar
+citrine
+claret
+clay
+cobalt
+cocoa
 copper
 coral
+cornflower
+cranberry
 cream
+crimson
 cyan
+denim
+emerald
+fawn
+fern
+flax
+forest
+garnet
+ginger
 gold
+grape
+graphite
 gray
+grayish
 green
+greenish
+hazel
+heather
+henna
+hickory
+honey
 indigo
 ivory
 jade
+jasper
+jet
 khaki
+lava
+lavender
+lemon
 lilac
 lime
+linen
 magenta
+mahogany
+malachite
+marigold
 maroon
+mauve
+melon
+midnight
 mint
+mocha
+moss
+mulberry
+mustard
 navy
+obsidian
+ochre
 olive
+onyx
+opal
 orange
+orchid
+papaya
+paprika
 peach
+peacock
+pearl
+periwinkle
+persimmon
+pewter
+pine
 pink
+pinkish
+pistachio
+platinum
 plum
+porcelain
+pumpkin
 purple
+quartz
+raspberry
+raven
 red
+reddish
 rose
+rosewood
+ruby
+russet
 rust
+sable
+saffron
+sage
+salmon
 sand
+sapphire
+scarlet
+seafoam
+sepia
+shamrock
+sienna
 silver
 slate
+smokey
+sorrel
+steel
+straw
+sunflower
 tan
+tangerine
+taupe
 teal
+terracotta
+thistle
+tomato
+topaz
+turquoise
+umber
+vanilla
 violet
+viridian
+walnut
+wheat
 white
+wine
+wisteria
 yellow
+yellowish
diff --git a/hostname-wordlist/weather b/hostname-wordlist/weather
index adbc2f5bae..7b74b05a06 100644
--- a/hostname-wordlist/weather
+++ b/hostname-wordlist/weather
@@ -1,23 +1,36 @@
 # SPDX-License-Identifier: MIT-0
+airy
+arid
+autumnal
 balmy
+bleak
+blustery
 breezy
 bright
 brisk
+brumal
 calm
 chilly
 clear
+clement
 cloudless
 cloudy
 cold
 cool
 crisp
 damp
+dewy
+dreary
+drizzly
 dry
 dusty
 fair
 foggy
+freezing
+fresh
 frosty
 gentle
+glacial
 glorious
 gusty
 halcyon
@@ -25,19 +38,45 @@ hazy
 humid
 icy
 idyllic
+mellow
 mild
 misty
+mizzly
 moonlit
 muggy
+overcast
+placid
+pleasant
+polar
+radiant
+rainless
 rainy
 serene
+shady
+showery
+sleety
+slushy
 snowy
+soggy
+sparkling
+squally
 starlit
+starry
 still
 stormy
 summery
+sunbaked
 sunlit
 sunny
+temperate
+thundery
+toasty
+tranquil
+tropical
+twilit
+unclouded
+vernal
 warm
+windless
 windy
 wintry
diff --git a/hostname-wordlist/worlds b/hostname-wordlist/worlds
index d472a083ef..46739ae51c 100644
--- a/hostname-wordlist/worlds
+++ b/hostname-wordlist/worlds
@@ -1,41 +1,154 @@
 # SPDX-License-Identifier: MIT-0
+achernar
+acrux
+adhara
+albireo
+alcor
+alcyone
+aldebaran
+alfheim
+algol
+alioth
+alnilam
+alnitak
+alphard
+altair
+amalthea
+antares
+arcadia
+arcturus
 ariel
+asgard
+atlantis
+atlas
+atria
+avalon
+avior
+bellatrix
+bennu
+betelgeuse
+bifrost
 callisto
+calypso
+camelot
+canopus
+capella
+castor
+celaeno
 ceres
 charon
 deimos
+deneb
+denebola
 dione
+dubhe
+eden
+elara
+eldorado
+elnath
+elysium
 enceladus
+enif
+erebus
 eris
 europa
+gacrux
+galatea
 ganymede
 gonggong
+hadar
+hamal
+haumea
+hydra
+hygiea
 hyperion
+iapetus
 io
+ixion
+izar
+jotunheim
 juno
 jupiter
+kerberos
+kochab
+lemuria
 luna
+maia
 makemake
+markab
 mars
+megrez
+merak
 mercury
+merope
+metis
+midgard
 mimas
+mimosa
+mintaka
+mira
+mirach
 miranda
+mirfak
+mizar
+mu
+muspelheim
+naiad
+naos
 neptune
+nereid
+niflheim
 nix
+nunki
 oberon
+olympus
 orcus
 pallas
+phecda
 phobos
+phoebe
+pleione
 pluto
+polaris
+pollux
+procyon
+proteus
+proxima
+psyche
+puck
+quaoar
+regulus
 rhea
+rigel
+ryugu
+sadr
+saiph
 saturn
 sedna
+shambhala
+shangrila
+sirius
+spica
+sterope
 styx
+tartarus
+taygeta
 terra
+thalassa
+thebe
 thetis
+thuban
+thule
+tirnanog
 titan
 triton
 umbriel
 uranus
-venus
+utopia
+valhalla
+vanaheim
+varuna
+vega
 vesta
+xanadu
+yggdrasil