diff --git a/salt-master-setup.sh b/salt-master-setup.sh
index 8f33a72..d231987 100755
--- a/salt-master-setup.sh
+++ b/salt-master-setup.sh
@@ -145,7 +145,15 @@
 
   if [ ! -d /srv/salt/reclass ]; then
     # No reclass at all, clone from given address
-    git clone ${RECLASS_ADDRESS} /srv/salt/reclass -b ${RECLASS_BRANCH:-master}
+    ssh-keyscan -H github.com >> ~/.ssh/known_hosts || true
+    if echo ${RECLASS_BRANCH:-master} | egrep -q "^refs"; then		
+        git clone ${RECLASS_ADDRESS} /srv/salt/reclass		
+        cd /srv/salt/reclass		
+        git fetch ${RECLASS_ADDRESS} ${RECLASS_BRANCH:-master} && git checkout FETCH_HEAD		
+        cd -		
+    else		
+        git clone -b ${RECLASS_BRANCH:-master} ${RECLASS_ADDRESS} /srv/salt/reclass;		
+    fi;
   fi;
 
   cd /srv/salt/reclass