diff --git a/conf/acronyms.conf b/conf/acronyms.conf
index 6a86672079bb614494e7129bce7f46efde62d270..13708d2df226a526b6ffeb31b452f411d60c088c 100644
--- a/conf/acronyms.conf
+++ b/conf/acronyms.conf
@@ -3,6 +3,7 @@
 ACL          Access Control List
 AFAICS       As far as I can see
 AFAIK        As far as I know
+AFAIR        As far as I remember
 AJAX         Asynchronous JavaScript and XML
 AIM          AOL (America Online) Instant Messenger
 AOL          America Online
@@ -16,9 +17,10 @@ CMS          Content Management System
 CSS          Cascading Style Sheets
 CVS          Concurrent Versions System
 DBA          Database Administrator
+DHCP         Dynamic Host Configuration Protocol
 DHTML        Dynamic HyperText Markup Language
 DMCA         Digital Millenium Copyright Act
-DNS          Domain Name Server
+DNS          Domain Name System
 DOM          Document Object Model
 DTD          Document Type Definition
 EOF          End of file
@@ -30,7 +32,7 @@ FAQ          Frequently Asked Questions
 FDL          GNU Free Documentation License
 FTP          File Transfer Protocol
 FOSS         Free & Open-Source Software
-FLOSS        Free/Libre and Open Source Software 
+FLOSS        Free/Libre and Open Source Software
 FUD          Fear, Uncertainty, and Doubt
 GB           Gigabyte
 GHz          Gigahertz
@@ -60,6 +62,7 @@ JPEG         Joint Photographics Experts Group
 JPG          Joint Photographics Experts Group
 JS           JavaScript
 KISS         Keep it simple stupid
+LDAP         Lightweight Directory Access Protocol
 LGPL         GNU Lesser General Public License
 LOL          Laughing out loud
 MathML       Mathematical Markup Language
@@ -72,6 +75,8 @@ MP3          Motion Picture Experts Group Layer 3
 MPEG         Motion Picture Experts Group
 MSDN         Microsoft Developer Network
 MS           Microsoft
+MSIE         Microsoft Internet Explorer
+NIS          Network Information Service
 NS4.7        Netscape 4.7
 NS4          Netscape 4
 NS6          Netscape 6