diff --git a/src/backend/libpq/pg_hba.conf.sample b/src/backend/libpq/pg_hba.conf.sample
index 1152a3c6cf..159b82634b 100644
--- a/src/backend/libpq/pg_hba.conf.sample
+++ b/src/backend/libpq/pg_hba.conf.sample
@@ -110,26 +110,26 @@
 # 
 #   all         127.0.0.1    0.0.0.0
 
-# TYPE       DATABASE    IP_ADDRESS    MASK              USERAUTH  MAP
+# TYPE       DATABASE    IP_ADDRESS    MASK                USERAUTH  MAP
  
-#host         all         127.0.0.1     255.255.255.255   trust     
+#host         all         127.0.0.1    255.255.255.255     trust     
  
 # The above allows any user on the local system to connect to any database
 # under any username.
  
-#host         template1   192.168.93.0   255.255.255.0    ident     sameuser
+#host         template1   192.168.93.0 255.255.255.0       ident     sameuser
  
 # The above allows any user from any host with IP address 192.168.93.x to
 # connect to database template1 as the same username that ident on that host
 # identifies him as (typically his Unix username).  
 
-#host         all        192.168.54.1  255.255.255.255   reject
-#host         all        0.0.0.0       0.0.0.0           trust
+#host         all        192.168.54.1  255.255.255.255     reject
+#host         all        0.0.0.0       0.0.0.0             trust
 
 # The above would allow anyone anywhere except from 192.168.54.1 to connect to
 # any database under any username.
 
-#host         all        192.168.77.0  255.255.255.0      ident     omicron
+#host         all        192.168.77.0  255.255.255.0       ident     omicron
 #
 # The above would allow users from 192.168.77.x hosts to connect to any
 # database, but if Ident says the user is "bryanh" and he requests to
@@ -139,5 +139,5 @@
 
 # By default, allow anything over UNIX domain sockets and localhost.
 
-local        all                                         trust
-host         all         127.0.0.1     255.255.255.255   trust
+local        all                                           trust
+host         all         127.0.0.1     255.255.255.255     trust