diff --git a/ChangeLog b/ChangeLog
index d7af872..874b359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-12-09 15:51  
+
+	* [r461] ChangeLog:
+	  fix build issues - utf-8 gpg uid still not supported for most rpm
+	  based distros
+
 2016-12-09 12:12  
 
 	* [r460] ChangeLog, ax_init_standard_project.m4, bootstrap.sh,
diff --git a/build-in-docker.sh b/build-in-docker.sh
index db5d561..77a1da9 100755
--- a/build-in-docker.sh
+++ b/build-in-docker.sh
@@ -216,8 +216,10 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
 fi
 case $mode in
     (deb|apt)
-        docker exec ${DOCKER_ID} locale-gen ${LANG}
-        docker exec ${DOCKER_ID} update-locale LANG=${LANG}
+        if [[ "${img}" =~ "ubuntu" ]]; then
+            docker exec ${DOCKER_ID} locale-gen ${LANG}
+            docker exec ${DOCKER_ID} update-locale LANG=${LANG}
+        fi
         OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
         for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
             docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"