diff --git a/bootstrap.sh b/bootstrap.sh
index e5dbae0..53ba559 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1551,12 +1551,25 @@ BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
 %if 0%{?fedora} != 20
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
 %endif
-%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version}
-BuildRequires: which, svn2cl, pkgconfig, redhat-lsb$(
+%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
+BuildRequires: which, pkgconfig$(
     if testtag AX_USE_LIBTOOL; then
-      echo -n ", libtool-ltdl-devel";
+      echo -n ", cppunit-devel"
     fi
 )
+%if 0%{?mageia}
+BuildRequires: lsb-release$(
+    if testtag AX_USE_LIBTOOL; then
+      echo -n ", libltdl-devel"
+    fi
+)
+%else
+BuildRequires: redhat-lsb$(
+    if testtag AX_USE_LIBTOOL; then
+      echo -n ", libtool-ltdl-devel"
+    fi
+)
+%endif
 %if ! ( 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} )
 $(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: mscgen"; fi)
 $(if testtag AX_REQUIRE_QT || testtag AX_CHECK_QT AX_REQUIRE_QT; then echo -n "BuildRequires: qt5-qtbase-devel, qt5-qttools, qt5-qtwebkit-devel"; fi)
diff --git a/build-in-docker.sh b/build-in-docker.sh
index 38a6c61..bdb5196 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -211,7 +211,7 @@ if ! docker exec ${DOCKER_ID} getent group $(id -g) > /dev/null 2>&1; then
     docker exec ${DOCKER_ID} groupadd -g $(id -g) $(id -gn)
 fi
 if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
-    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -u) -d"${HOME}" $(id -un)
+    docker exec ${DOCKER_ID} useradd -m -u $(id -u) -g $(id -g) -d"${HOME}" $(id -un)
 fi
 case $mode in
     (deb|apt)