diff --git a/libraries/ocaml-batteries/ocaml-batteries.SlackBuild b/libraries/ocaml-batteries/ocaml-batteries.SlackBuild
index 26cc2b15b5..b2fe0c19ff 100644
--- a/libraries/ocaml-batteries/ocaml-batteries.SlackBuild
+++ b/libraries/ocaml-batteries/ocaml-batteries.SlackBuild
@@ -23,16 +23,16 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=ocaml-batteries
-VERSION=${VERSION:-2.5.0}
+VERSION=${VERSION:-3.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=batteries
+SRCNAM=batteries-included
 
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$(uname -m) ;;
   esac
@@ -50,8 +50,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"
diff --git a/libraries/ocaml-batteries/ocaml-batteries.info b/libraries/ocaml-batteries/ocaml-batteries.info
index b700a1207f..e0a4fbaeb8 100644
--- a/libraries/ocaml-batteries/ocaml-batteries.info
+++ b/libraries/ocaml-batteries/ocaml-batteries.info
@@ -1,10 +1,10 @@
 PRGNAM="ocaml-batteries"
-VERSION="2.5.0"
+VERSION="3.4.0"
 HOMEPAGE="http://batteries.forge.ocamlcore.org/"
-DOWNLOAD="https://slackware.uk/~urchlay/src/batteries-2.5.0.tar.gz"
-MD5SUM="8eac258d184e12f2c224249968cedcc0"
+DOWNLOAD="https://github.com/ocaml-batteries-team/batteries-included/archive/v3.4.0/batteries-included-3.4.0.tar.gz"
+MD5SUM="66b6e0b25769fc2363972c6a6ab6ac33"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="ocaml-camomile ocaml-findlib ocaml-num"
+REQUIRES="ocaml-findlib ocaml-num ocamlbuild"
 MAINTAINER="Jockey S. Kyd"
 EMAIL="jockey.kyd@gmail.com"