diff --git a/README.md b/README.md
index 7e59d8cd4..be88513ea 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ Region:    us-east-1
 Browser Access:
    http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
 
-Command-line Access: https://docs.minio.io/docs/minio-client-quick-start-guide
+Command-line Access: https://docs.minio.io/docs/minio-client-quickstart-guide
    $ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
 
 Object API (Amazon S3 compatible):
@@ -76,7 +76,7 @@ Region:    us-east-1
 Browser Access:
    http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
 
-Command-line Access: https://docs.minio.io/docs/minio-client-quick-start-guide
+Command-line Access: https://docs.minio.io/docs/minio-client-quickstart-guide
    $ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
 
 Object API (Amazon S3 compatible):
@@ -102,7 +102,7 @@ Region:    us-east-1
 Browser Access:
    http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
 
-Command-line Access: https://docs.minio.io/docs/minio-client-quick-start-guide
+Command-line Access: https://docs.minio.io/docs/minio-client-quickstart-guide
    $ mc.exe config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
 
 Object API (Amazon S3 compatible):
@@ -139,7 +139,7 @@ Region:    us-east-1
 Browser Access:
    http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
 
-Command-line Access: https://docs.minio.io/docs/minio-client-quick-start-guide
+Command-line Access: https://docs.minio.io/docs/minio-client-quickstart-guide
    $ mc config host add myminio http://10.0.0.10:9000 USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
 
 Object API (Amazon S3 compatible):
diff --git a/docs/FreeBSD.md b/docs/FreeBSD.md
index dee2da5b7..b9e70d92d 100644
--- a/docs/FreeBSD.md
+++ b/docs/FreeBSD.md
@@ -110,22 +110,23 @@ $ curl https://dl.minio.io/server/minio/release/freebsd-amd64/minio > minio
 $ chmod 755 minio
 $ ./minio server /minio-example/compressed-objects
 
-AccessKey: X3RU3Q6B4T20TYB281W5  SecretKey: bvp0DF8c+6MzL60UxFqOZGlA5Z8UPfIAATUQuzLS  Region: us-east-1
-
-Minio Object Storage:
-    http://159.203.234.49:9000
-    http://10.12.0.5:9000
-    http://127.0.0.1:9000
-
-Minio Browser:
-    http://159.203.234.49:9000
-    http://10.12.0.5:9000
-    http://127.0.0.1:9000
-
-To configure Minio Client:
-    $ wget https://dl.minio.io/client/mc/release/freebsd-amd64/mc
-    $ chmod 755 mc
-    $ ./mc config host add myminio http://localhost:9000 X3RU3Q6B4T20TYB281W5 bvp0DF8c+6MzL60UxFqOZGlA5Z8UPfIAATUQuzLS
+
+Endpoint:  http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
+AccessKey: USWUXHGYZQYFYFFIT3RE
+SecretKey: MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
+Region:    us-east-1
+
+Browser Access:
+  http://10.0.0.10:9000  http://127.0.0.1:9000  http://172.17.0.1:9000
+
+Command-line Access: https://docs.minio.io/docs/minio-client-quickstart-guide
+  $ mc config host add myminio http://localhost:9000  USWUXHGYZQYFYFFIT3RE MOJRH0mkL1IPauahWITSVvyDrQbEEIwljvmxdq03
+
+Object API (Amazon S3 compatible):
+  Go:         https://docs.minio.io/docs/golang-client-quickstart-guide
+  Java:       https://docs.minio.io/docs/java-client-quickstart-guide
+  Python:     https://docs.minio.io/docs/python-client-quickstart-guide
+  JavaScript: https://docs.minio.io/docs/javascript-client-quickstart-guide
 
 ```