diff --git a/ispdb/earthlink.net.xml b/ispdb/earthlink.net.xml
index 91044ff..9e8a0d4 100644
--- a/ispdb/earthlink.net.xml
+++ b/ispdb/earthlink.net.xml
@@ -4,6 +4,7 @@
     <domain>earthlink.net</domain>
     <domain>mindspring.com</domain>
     <domain>ix.netcom.com</domain>
+    <domain>peoplepc.com</domain>
     <!-- many other domains, via MX earthlink.net -->
     <displayName>EarthLink</displayName>
     <displayShortName>EarthLink</displayShortName>
diff --git a/ispdb/goo.jp.xml b/ispdb/goo.jp.xml
index ef4d5f7..53bf4e5 100644
--- a/ispdb/goo.jp.xml
+++ b/ispdb/goo.jp.xml
@@ -4,19 +4,28 @@
     <domain>goo.jp</domain>
     <displayName>goo メールアドバンス</displayName>
     <displayShortName>goo</displayShortName>
+    <incomingServer type="imap">
+      <hostname>imap.mail.goo.jp</hostname>
+      <port>993</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
+      <authentication>password-cleartext</authentication>
+    </incomingServer>
     <incomingServer type="pop3">
-      <hostname>pop.mail.goo.ne.jp</hostname>
-      <port>110</port>
-      <socketType>plain</socketType>
-      <username>%EMAILLOCALPART%</username>
+      <hostname>pop.mail.goo.jp</hostname>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
       <authentication>password-cleartext</authentication>
     </incomingServer>
     <outgoingServer type="smtp">
-      <hostname>smtp.mail.goo.ne.jp</hostname>
-      <port>587</port>
-      <socketType>plain</socketType>
-      <username>%EMAILLOCALPART%</username>
+      <hostname>smtp.mail.goo.jp</hostname>
+      <port>465</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
       <authentication>password-cleartext</authentication>
     </outgoingServer>
+    <documentation
+      url="https://web.archive.org/web/20251118110504/https://mail.goo.ne.jp/howto/#app" />
   </emailProvider>
 </clientConfig>
diff --git a/ispdb/nifty.com.xml b/ispdb/nifty.com.xml
index 12217d4..fbc9352 100644
--- a/ispdb/nifty.com.xml
+++ b/ispdb/nifty.com.xml
@@ -6,17 +6,18 @@
     <displayShortName>@nifty</displayShortName>
     <incomingServer type="pop3">
       <hostname>pop.nifty.com</hostname>
-      <port>110</port>
-      <socketType>plain</socketType>
-      <username>%EMAILLOCALPART%</username>
+      <port>995</port>
+      <socketType>SSL</socketType>
+      <username>%EMAILADDRESS%</username>
       <authentication>password-encrypted</authentication>
     </incomingServer>
     <outgoingServer type="smtp">
       <hostname>smtp.nifty.com</hostname>
       <port>587</port>
       <socketType>plain</socketType>
-      <username>%EMAILLOCALPART%</username>
+      <username>%EMAILADDRESS%</username>
       <authentication>password-encrypted</authentication>
     </outgoingServer>
+    <documentation url="https://mail.nifty.com/info/manual/#settingMethod-area" />
   </emailProvider>
 </clientConfig>
diff --git a/ispdb/peoplepc.com.xml b/ispdb/peoplepc.com.xml
deleted file mode 100644
index 01429db..0000000
--- a/ispdb/peoplepc.com.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<clientConfig version="1.1">
-  <emailProvider id="peoplepc.com">
-    <domain>peoplepc.com</domain>
-    <displayName>PeoplePC</displayName>
-    <displayShortName>PeoplePC</displayShortName>
-    <incomingServer type="imap">
-      <hostname>imap.peoplepc.com</hostname>
-      <port>143</port>
-      <socketType>plain</socketType>
-      <username>%EMAILADDRESS%</username>
-      <authentication>password-encrypted</authentication>
-    </incomingServer>
-    <incomingServer type="pop3">
-      <hostname>pop.peoplepc.com</hostname>
-      <port>110</port>
-      <socketType>plain</socketType>
-      <username>%EMAILADDRESS%</username>
-      <authentication>password-encrypted</authentication>
-    </incomingServer>
-    <outgoingServer type="smtp">
-      <hostname>smtpauth.peoplepc.com</hostname>
-      <port>587</port>
-      <socketType>STARTTLS</socketType>
-      <username>%EMAILADDRESS%</username>
-      <authentication>password-encrypted</authentication>
-    </outgoingServer>
-  </emailProvider>
-</clientConfig>