diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
index e51ec923a0..c1746e8933 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.SlackBuild
@@ -27,7 +27,7 @@
 
 
 PRGNAM="dovecot-pigeonhole"
-VERSION=${VERSION:-0.3.5}
+VERSION=${VERSION:-0.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -68,12 +68,13 @@ cd $TMP
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $TMP/$SRCNAM-$VERSION
 chown -R root.root .
-find . \
-\( -perm 664 -o -perm 666 -o -perm 600 -o -perm 440 -o -perm 444 -o -perm 400 \) \
--exec chmod 644 {} \;
-find . \
-\( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \
--exec chmod 755 {} \;
+
+find -L . \
+\( -perm 664 -o -perm 666 -o -perm 640 -o -perm 600 -o -perm 440 -o -perm 444 \
+  -o -perm 400 \) -exec chmod 644 {} \;
+find -L . \
+\( -perm 777 -o -perm 755 -o -perm 750 -o -perm 711 -o -perm 700 -o -perm 555 \
+  -o -perm 511 -o -perm 500 \) -exec chmod 755 {} \;
 
 CFLAGS="$SLKCFLAGS" \
   ./configure \
diff --git a/network/dovecot-pigeonhole/dovecot-pigeonhole.info b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
index d5d29ef6cc..547a5991c4 100644
--- a/network/dovecot-pigeonhole/dovecot-pigeonhole.info
+++ b/network/dovecot-pigeonhole/dovecot-pigeonhole.info
@@ -1,8 +1,8 @@
 PRGNAM="dovecot-pigeonhole"
-VERSION="0.3.5"
+VERSION="0.3.6"
 HOMEPAGE="http://pigeonhole.dovecot.org/"
-DOWNLOAD="http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-pigeonhole-0.3.5.tar.gz"
-MD5SUM="2a5a36dac3d5a8f4fb44c8c726f56a06"
+DOWNLOAD="http://pigeonhole.dovecot.org/releases/2.1/dovecot-2.1-pigeonhole-0.3.6.tar.gz"
+MD5SUM="57065dee685264b848d6d4c17b27dcd8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="dovecot"