diff --git a/network/imapproxy/README b/network/imapproxy/README
index f2c5997a7a..4d8b46b164 100644
--- a/network/imapproxy/README
+++ b/network/imapproxy/README
@@ -3,6 +3,7 @@ imapproxy (SquirrelMail's IMAP Proxy server)
 SquirrelMail's IMAP Proxy is a caching IMAP proxy server intended
 for use with webmail clients that cannot maintain persistent
 connections to an IMAP server.
+
 IMAP Proxy simply sits between your webmail server and your IMAP
 server. It accepts connections from your webmail server for each
 client login, then proxies that connection to your real IMAP server.
diff --git a/network/imapproxy/imapproxy.SlackBuild b/network/imapproxy/imapproxy.SlackBuild
index c95e426c51..04ee52efd1 100644
--- a/network/imapproxy/imapproxy.SlackBuild
+++ b/network/imapproxy/imapproxy.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for imapproxy
 
-# Copyright (c) 2014-2015 Thomas Szteliga <ts@websafe.pl>
+# Copyright (c) 2014-2016 Thomas Szteliga <ts@websafe.pl>, Opole, PL
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -29,7 +29,7 @@ TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -59,7 +59,7 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
+rm -rf squirrelmail-imap_proxy-$VERSION
 tar xvf $CWD/squirrelmail-imap_proxy-$VERSION.tar.gz
 cd squirrelmail-imap_proxy-$VERSION
 chown -R root:root .
@@ -96,7 +96,13 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING ChangeLog README README.known_issues README.ssl $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COPYING \
+  ChangeLog \
+  README \
+  README.known_issues \
+  README.ssl \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install