diff --git a/README.rst b/README.rst
index b64b91b..c9eeb93 100644
--- a/README.rst
+++ b/README.rst
@@ -25,8 +25,29 @@ For example, using ``curl`` to install latest git:
   curl -L http://bootstrap.saltstack.org | sudo sh -s -- git develop
 
 
+In case `curl` tells you something like:
 
-Or, using ``wget`` to install your distribution's stable packages:
+```
+curl: (60) SSL certificate problem, verify that the CA cert is OK. Details:
+error:14090086:SSL routines:SSL3_GET_SERVER_CERTIFICATE:certificate verify failed
+More details here: http://curl.haxx.se/docs/sslcerts.html
+
+curl performs SSL certificate verification by default, using a "bundle"
+ of Certificate Authority (CA) public keys (CA certs). If the default
+ bundle file isn't adequate, you can specify an alternate file
+ using the --cacert option.
+If this HTTPS server uses a certificate signed by a CA represented in
+ the bundle, the certificate verification probably failed due to a
+ problem with the certificate (it might be expired, or the name might
+ not match the domain name in the URL).
+If you'd like to turn off curl's verification of the certificate, use
+ the -k (or --insecure) option.
+```
+
+Append `-k` or `--insecure` to the `curl` options.
+
+
+Using ``wget`` to install your distribution's stable packages:
 
 .. code:: console
 
diff --git a/bootstrap-salt-minion.sh b/bootstrap-salt-minion.sh
index 76ae82c..7fc7baa 100755
--- a/bootstrap-salt-minion.sh
+++ b/bootstrap-salt-minion.sh
@@ -1187,7 +1187,17 @@ install_smartos_stable() {
 }
 
 install_smartos_git() {
-    /opt/local/bin/python setup.py install
+
+    USE_SETUPTOOLS=1 /opt/local/bin/python setup.py install
+
+    # Install manifest files if needed.
+    for fname in minion master syndic; do
+        svcs network/salt-$fname > /dev/null 2>&1
+        if [ $? -eq 1 ]; then
+            svccfg import ${SALT_GIT_CHECKOUT_DIR}/solaris/salt-$fname.xml
+            svcadm enable salt-$fname
+        fi
+    done
 }
 
 install_smartos_post() {