diff --git a/network/connman/connman.SlackBuild b/network/connman/connman.SlackBuild
index 13fa8cd7e0..2cee777343 100644
--- a/network/connman/connman.SlackBuild
+++ b/network/connman/connman.SlackBuild
@@ -22,7 +22,6 @@
 # with this program (most likely, a file named COPYING).  If not, see
 # <http://www.gnu.org/licenses/>.
 
-
 PRGNAM=connman
 VERSION=${VERSION:-1.32}
 BUILD=${BUILD:-1}
@@ -61,49 +60,60 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
+chown -R root:root .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 patch -p1 < $CWD/allow_group_network.diff
 
 # fix cmst issue
 sed -i "s|deny|allow|" plugins/connman-nmcompat.conf
 
-# configure
-CFLAGS=${SCFLAGS} CXXFLAGS=${SCXXFLAGS} LIBS=-lncurses \
-  ./configure \
-    --prefix=/usr \
-    --libdir=/usr/lib${LIBDIRSUFFIX} \
-    --mandir=/usr/man \
-    --sysconfdir=/etc \
-    --localstatedir=/var \
-    --enable-nmcompat \
-    --enable-polkit \
-    --enable-openvpn \
-    --enable-client \
-    --build=${ARCH}-slackware-linux
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LIBS=-lncurses \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --sysconfdir=/etc \
+  --localstatedir=/var \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --enable-nmcompat \
+  --enable-polkit \
+  --enable-openvpn \
+  --enable-client \
+  --build=${ARCH}-slackware-linux
 
-make OPTS="$SLKCFLAGS"
-make DESTDIR=${PKG} install
+make
+make install DESTDIR=$PKG
 
-mkdir -p ${PKG}/etc/rc.d
-install -m 644 ${CWD}/rc.connmand ${PKG}/etc/rc.d/
+cp -av client/connmanctl $PKG/usr/sbin/
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
-install -m644 AUTHORS COPYING ChangeLog INSTALL README TODO doc/*.txt \
-  ${PKG}/usr/doc/${PRGNAM}-${VERSION}/
-mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}/api
-mv ${PKG}/usr/doc/${PRGNAM}-${VERSION}/{*-api.txt,api/}
-
-cp -av $PWD/client/connmanctl $PKG/usr/sbin/
-
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-cd ${PKG}
-mkdir install
-install -m644 ${CWD}/slack-desc install/
+mkdir -p ${PKG}/etc/rc.d
+install -m 644 ${CWD}/rc.connmand ${PKG}/etc/rc.d/
+
+mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}
+install -m644 AUTHORS COPYING ChangeLog INSTALL README TODO doc/*.txt \
+  ${PKG}/usr/doc/${PRGNAM}-${VERSION}/
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
+mkdir -p ${PKG}/usr/doc/${PRGNAM}-${VERSION}/api
+mv ${PKG}/usr/doc/${PRGNAM}-${VERSION}/{*-api.txt,api/}
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/connman/connman.info b/network/connman/connman.info
index ecdb44a1f2..ae7d3d5b18 100644
--- a/network/connman/connman.info
+++ b/network/connman/connman.info
@@ -6,5 +6,5 @@ MD5SUM="d0c3071c1d8dec9cd17b760f862de2ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+MAINTAINER="Jason Graham"
+EMAIL="jgraha8@gmail.com"