diff --git a/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/added.txt b/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/added.txt
index e50ac34008b2..3d6e92b7d608 100644
--- a/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/added.txt
+++ b/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/added.txt
@@ -4,12 +4,12 @@
 # This does not add words to the spell checker, see hunspell/spelling.txt for that.
 # File Encoding: UTF-8
 # Format: three tab-separated fields: fullform baseform postags
-
+#
+conosco	comigo	PP1CPO00
 diversas	diverso	DI0FP0
 diversas	diverso	PI0FP000
 diversos	diverso	DI0MP0
 diversos	diverso	PI0MP000
-conosco	comigo	PP1CPO00
 embaixo	embaixo	RG
 idem	idem	RG
 mega	mega	RG
@@ -17,9 +17,9 @@ mesmíssima	mesmíssimo	DD0FS0
 mesmíssimas	mesmíssimo	DD0FP0
 mesmíssimo	mesmíssimo	DD0MS0
 mesmíssimos	mesmíssimo	DD0MP0
-ok	ok	RG
 OK	OK	RG
 Ok	ok	RG
+ok	ok	RG
 pouquíssima	pouquíssimo	DI0FS0
 pouquíssimas	pouquíssimo	DI0FP0
 pouquíssimo	pouquíssimo	DD0MS0
@@ -41,12 +41,11 @@ vcs	vcs	PP3CP000
 # Add entries manually from here                     #
 ######################################################
 ######################################################
-
+#
 # problematic entries, to review
-
-média	média:2	NCMP000
 ad	ad	NCCSS00
 ads	ad	NCCPS00
+Airbus	Airbus	NCCNO00
 Alpha	Alpha	AQ0CS0
 Alpha	Alpha	NCCS000
 Alphas	Alpha	AQ0CP0
@@ -59,6 +58,7 @@ bolds	bold	NCCP000
 bonehead	bonehead	NCCS000
 boneheads	bonehead	NCCP000
 bottom-up	bottom-up	NCCN000
+BT	BT	AQ0CN0
 bull	bull	NCMS000
 C2	C2	NCMN000
 card	card	NCMS000
@@ -81,8 +81,12 @@ dBmW	dBmW	AO0CN0
 Dell	Dell	NCFSO00
 demand	demand	NCFS000
 demands	demand	NCFP000
+desenrolar	desenrolar	NCMN000
 direct	direct	NCMS000
-directs	directs	NCMP000
+directs	direct	NCMP000
+Ed	Ed	NCMSS00
+Eds	Ed	NCMPS00
+EF	EF	NCCS000
 epóxi	epóxi	AQ0CN0
 extras	extra	AQ0CP0
 flag	flag	NCFS000
@@ -90,21 +94,24 @@ flags	flag	NCFP000
 footnote	footnote	NCFS000
 footnotes	footnote	NCFP000
 friendly	friendly	AQ0CS0
+frontman	frontman	NCMS000
 FSR	FSR	AQ0CN0
 gap	gap	NCMS000
-gap 	gap 	NCCS000
+gap	gap	NCCS000
 gaps	gap	NCMP000
-gaps 	gap 	NCCP000
+gaps	gap	NCCP000
 Globo	Globo	AQ0CN0
 gold	gold	AQ0CN0
 gold	gold	NCMS000
 health	health	NCFS000
 height	height	NCFS000
 heights	height	NCFP000
+hidro	hidro	NCFS000
 idle	idle	NCMN000
 iFood	iFood	AQ0CN0
 layer	layer	NCFS000
 layers	layer	NCFP000
+Linux	Linux	AQ0CN0
 lossless	lossless	NCCN000
 Margherita	Margherita	AQ0FS0
 Margheritas	Margherita	AQ0FP0
@@ -115,26 +122,35 @@ marketplaces	marketplace	NCMP000
 Marvel	Marvel	AQ0CN0
 Mastercard	Mastercard	AQ0CN0
 MasterCard	MasterCard	AQ0CN0
+média	média:2	NCMP000
+mirrorless	mirrorless	AQ0CN0
 oper	oper	NCCS000
 opers	oper	NCCP000
+Ophiuchus	Ophiuchus	AQ0CN0
 performer	performer	NCCFS00
 pet	pet	AQ0CN0
 pet	pet	NCMS000
 pets	pets	NCMP000
 pix	pix	AQ0CN0
 pix	pix	NCMS000
+Play	Play	NCMS000
 PlayArte	PlayArte	AQ0CN0
 podere	podere	NCMSV00
-popular 	popular	NCCS000
+popular	popular	NCCS000
 prime	prime	AQ0CN0
+Profa	Profa	NCFS000
 PrtSc	PrtSc	NCCS000
 Puma	Puma	NCCSO00
+quentinho	quentinho	NCMS000
+quentinhos	quentinho	NCMP000
 R$	R$	NCCP000
 R$	R$	NCCS000
 R$	R$	NCMP000
 R$	R$	NCMS000
 Rebook	Rebook	NCCSO00
 Red	Red	NCMN000
+rockstar	rockstar	NCCS000
+rockstars	rockstar	NCCP000
 S	S	AO0CN0
 s	s	AO0CN0
 Samsung	Samsung	AQ0CN0
@@ -148,6 +164,8 @@ Simaria	Simaria	NCFSS00
 Simarias	Simaria	NCFPS00
 sis	sis	NCFS000
 Skechers	Skechers	NCCSO00
+spalla	spalla	NCFS000
+spallas	spalla	NCFP000
 Sr	Sr	NCMS000
 Sra	Sra	NCFS000
 Sras	Sra	NCFP000
@@ -160,7 +178,6 @@ tá	tá	VMIP2S0
 tá	tá	VMIP3S0
 tá	tá	VMN0000
 tão	tá	VMIP3P0
-tô	tá	VMIP1S0
 Telecom	Telecom	NCFSO00
 thrasher	thrasher	NCCS000
 thrashers	thrasher	NCCP000
@@ -168,14 +185,15 @@ threshold	threshold	NCMS000
 thresholds	threshold	NCMP000
 tip	tip	NCFS000
 tips	tip	NCFP000
+tô	tá	VMIP1S0
+todinha	todo	NCFS00D
 todinha	todo	NCFS00D
-todinha 	todo	NCFS00D
 todinhas	todo	NCFP00D
-todinhas 	todo	NCFP00D
+todinhas	todo	NCFP00D
+todinho	todo	NCMS00D
 todinho	todo	NCMS00D
-todinho 	todo	NCMS00D
 todinhos	todo	NCMP00D
-todinhos 	todo	NCMP00D
+todinhos	todo	NCMP00D
 top-down	top-down	NCCN000
 trigger	trigger	NCMS000
 triggers	trigger	NCMP000
@@ -192,25 +210,7 @@ whiskas	whiskas	NCFP000
 width	width	NCFS000
 widths	width	NCFP000
 yes-man	yes-man	NCMS000
-Ophiuchus	Ophiuchus	AQ0CN0
-mirrorless	mirrorless	AQ0CN0
-desenrolar	desenrolar	NCMN000
-hidro	hidro	NCFS000
-quentinho	quentinho	NCMS000
-quentinhos	quentinho	NCMP000
-rockstar	rockstar	NCCS000
-rockstars	rockstar	NCCP000
-frontman	frontman	NCMS000
-Play	Play	NCMS000
-spalla	spalla	NCFS000
-spallas	spalla	NCFP000
-Profa	Profa	NCFS000
-Airbus	Airbus	NCCNO00
-Ed	Ed	NCMSS00
-Eds	Ed	NCMPS00
-EF	EF	NCCS000
-BT	BT	AQ0CN0
-Linux	Linux	AQ0CN0
+
 
 # Added by Marco A.G.Pinto. Pedro told me to add here until he fixes the dictionary building.
 autoinflingir	autoinflingir	VMN0000
@@ -252,5 +252,6 @@ Tolstoy	Tolstoy	NPMS000
 Tolstoy	Tolstoy	NPMSS00
 videogravação	videogravação	NCFS000
 videogravações	videogravação	NCFP000
+Whirlpool	Whirlpool	NPFS000
 Woodcock	Woodcock	NPMS000
 WritingTool	WritingTool	NPMN000
diff --git a/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/spelling.txt b/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/spelling.txt
index 69db5d8d65bf..5d1ed62b01c5 100644
--- a/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/spelling.txt
+++ b/languagetool-language-modules/pt/src/main/resources/org/languagetool/resource/pt/spelling.txt
@@ -1,77 +1,129 @@
 # Questionable foreign words, must be reviewed
-basketball
-bear
-body
-check
-cherry
-crayon
-ferry
-funkies
-funky
-hockey
-karategi
-kata
-overbooked
-overwrite
-physalis
-postmaster
-pullover
-sampler
-screen
-server
-setter
-sir
-skincare
-snifar
-soccer
-stall
-tory
-whiskas
-whiskies
-whisky
-yeah
+acordéon
+aftershave
+agreement
 agrément
+aplomb
+apport
+assemblage
 attaché
 ayatollah
 backbone
 backdoor
 background
+ballet
+ballotage
+bandage
+basketball
+básquete
+bâton
 bazooka
+bear
+béguin
+bibelot
+biberon
+bidon
+bidonville
 bikini
+bip
 blasé
+bluff
+body
+boid
+boîte
+bold
 bonehead
+bordeaux
+bouquet
+boutique
 boyfriend
+brent
+brevet
+buda
+budget
+buffet
 bungalow
+bureau
+cabaret
+cabriolet
+cachet
+calèche
+camelot
+camp
+caoutchouc
+capot
+carnet
+cartoon
+cast
+catamaran
+cent
+chau
+chauffage
+check
 checkout
+cherry
 clarke
+clearance
 cloisonné
+club
 cocker
 cocktail
+compère
+complot
 consommé
 couché
+couchette
 coupé
+coupon
+courato
+courgette
+court
+crapaud
+crayon
+crochet
+croquet
+cuvette
+débacle
+début
 debye
-diskette
+décalage
 démarche
+dessert
+détente
+diskette
+dobermane
+écarté
 engagé
 evasé
+ferry
 ferryboat
 flyer
+funkies
+funky
 geisha
 geyser
 ghetto
+gilet
+gobelet
+godet
 goodbye
 goodwill
+gourmet
 gray
+guichet
 habitué
 height
+hockey
 horsepower
+igloo
 jackpot
 jerrycan
 jersey
 jockey
 junkie
+karategi
 karbovanet
+kata
 kispo
 klaxon
 kraft
@@ -83,39 +135,69 @@ kyat
 layer
 lek
 linotype
+maçon
+maître
+majorette
+manat
+manette
+manif
+maquillage
 market
 marketeer
 marketplace
+marron
+match
+matinée
 maxwell
 mayday
 mayonnaise
 mayor
+mêlée
 monokini
+mvdol
 negligé
 newsgroup
+omertà
 ouguiya
+overbooked
+overwrite
 pacemaker
 package
+parquet
 password
 patchwork
+pâté
+paul
+physalis
 pickle
 pickpocket
 playmaker
 poker
+postmaster
+pouf
+poule
+pourboire
+première
 publisher
-pâté
+pull
+pullover
 raffiné
 redneck
+rentrée
 rocker
 rocket
 rockstar
+sampler
 sandwich
 scam
 scammer
 scone
 score
 scotch
+screen
 screwball
+server
+setter
 shaker
 share
 sheik
@@ -125,8 +207,10 @@ shot
 shotgun
 showman
 shunt
+sir
 sketch
 skiff
+skincare
 slang
 slick
 slide
@@ -134,8 +218,14 @@ slip
 slow
 smash
 snack
+snifar
 snob
 snooker
+sobriquet
+soccer
+socquette
+soft
+soirée
 soufflé
 speaker
 speller
@@ -151,6 +241,7 @@ sprint
 sprinter
 sprue
 stakeholder
+stall
 star
 station
 stencil
@@ -164,18 +255,34 @@ straight
 street
 strip
 style
+surmenage
 swarm
 sweater
 sweatshirt
+tablette
 take
+target
+tarot
+tatami
 tawnie
+tee
 teleski
 terylene
 thrasher
 threshold
 timeshare
+toast
+toboggan
+toilette
+tory
+tournée
+trottinette
+troupe
+trousse
 underwear
+upscaling
 vamp
+vinaigrette
 volley
 wad
 wannabe
@@ -185,130 +292,27 @@ wasp
 watergate
 weber
 weekend
+whiskas
 whiskey
+whiskies
+whisky
 width
 winner
 yacht
 yard
+yeah
 yen
 yield
 yod
-écarté
-aftershave
-crapaud
-acordéon
-agreement
-aplomb
-ballet
-bibelot
-biberon
-bidon
-bidonville
-bip
-bluff
-boid
-bold
-bordeaux
-bouquet
-boutique
-boîte
-brent
-brevet
-buda
-budget
-buffet
-bureau
-básquete
-bâton
-béguin
-cabaret
-cabriolet
-cachet
-calèche
-camelot
-camp
-caoutchouc
-capot
-carnet
-cartoon
-cast
-catamaran
-cent
-chau
-chauffage
-clearance
-club
-complot
-compère
-omertà
-première
-pouf
-poule
-pourboire
-pull
-crochet
-croquet
-gilet
-gobelet
-godet
-gourmet
-guichet
-parquet
-sobriquet
-target
-tarot
-tee
-tatami
-tablette
-toilette
-trottinette
-vinaigrette
-courato
-couchette
-courgette
-court
-coupon
-cuvette
-socquette
-majorette
-manette
-marron
-match
-matinée
-tournée
-maçon
-maître
-mvdol
-mêlée
-rentrée
-soirée
-soft
-toboggan
-toast
-trousse
-troupe
-apport
-ballotage
-bandage
-décalage
-débacle
-début
-détente
-dobermane
-dessert
-igloo
-manat
-manif
-maquillage
-surmenage
-assemblage
-paul
+
 
 # Added by Marco A.G.Pinto. Pedro told me to add here until he fixes the dictionary building.
 absonância
 absonâncias
 acroleína
 acroleínas
+alimária
+alimárias
 arqueologicamente
 autoevidência
 autoevidências
@@ -334,8 +338,20 @@ encetaduras
 eternização
 eternizações
 euromilhões
+franguinha
+franguinhas
+franguinho
+franguinhos
+fresquinho
+fresquinhos
 galheta
 galhetas
+galiforme
+galiformes
+genetlíaca
+genetlíacas
+genetlíaco
+genetlíacos
 GIFs
 gratinada
 gratinadas
@@ -344,6 +360,7 @@ inumadas
 inumado
 inumados
 Jumarie
+lascarim
 legos
 longeva
 longevas
@@ -387,5 +404,6 @@ vestidinho
 vestidinhos
 videogravação
 videogravações
+Whirlpool
 Woodcock
 WritingTool