2 files changed, 18 insertions, 9 deletions

diff --git a/contrib/cygwin/README b/contrib/cygwin/README
index 5a9b1ce0c..3dd45014a 100644
--- a/contrib/cygwin/README
+++ b/contrib/cygwin/README
@@ -195,28 +195,37 @@ configure are used for the Cygwin binary distribution:
 
         --prefix=/usr \
         --sysconfdir=/etc \
-        --libexecdir='$(sbindir)' \
+        --libexecdir='${sbindir}' \
         --localstatedir=/var \
-        --datadir='$(prefix)/share' \
-        --mandir='$(datadir)/man' \
+        --datadir='${prefix}/share' \
+        --mandir='${datadir}/man' \
+        --infodir='${datadir}/info'
         --with-tcp-wrappers
 
 If you want to create a Cygwin package, equivalent to the one
 in the Cygwin binary distribution, install like this:
 
         mkdir /tmp/cygwin-ssh
-        cd $(builddir)
+        cd ${builddir}
         make install DESTDIR=/tmp/cygwin-ssh
-        cd $(srcdir)/contrib/cygwin
+        cd ${srcdir}/contrib/cygwin
         make cygwin-postinstall DESTDIR=/tmp/cygwin-ssh
         cd /tmp/cygwin-ssh
         find * \! -type d | tar cvjfT my-openssh.tar.bz2 -
-        
-You must have installed the zlib, the openssl-devel and the minires-devel
-packages to be able to build OpenSSH!
+
+You must have installed the following packages to be able to build OpenSSH:
+
+- zlib
+- openssl-devel
+- minires-devel
+
+If you want to build with --with-tcp-wrappers, you also need the package
+
+- tcp_wrappers
 
 Please send requests, error reports etc. to cygwin@cygwin.com.
 
+
 Have fun,
 
 Corinna Vinschen
diff --git a/contrib/cygwin/ssh-host-config b/contrib/cygwin/ssh-host-config
index 9c0dabf41..c7164f610 100644
--- a/contrib/cygwin/ssh-host-config
+++ b/contrib/cygwin/ssh-host-config
@@ -449,7 +449,7 @@ then
           echo "Should this script create a new local account 'sshd_server' which has"
           if request "the required privileges?"
           then
-            _admingroup=`awk -F: '{if ( $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
+            _admingroup=`awk -F: '{if ( $1 != "root" && $2 == "S-1-5-32-544" ) print $1;}' ${SYSCONFDIR}/group`
             if [ -z "${_admingroup}" ]
             then
               echo "There's no group with SID S-1-5-32-544 (Local administrators group) in"