diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f8af26..14c307e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,7 +4,13 @@
 
 ## [4.2.1-1] - 14/05/2018
 ### Added
-* Create this CHANGELOG.md
+* Set up a complete CI/CD system for this Docker, using CircleCI: docker is noz automatically packaged, tested and deployed to Docker Hub
+
+### Changed
+* Hotfix for BZIP2 binary, due to latest Alpine layout modifications, is now applied when the container is created, removing the error `n: /bin/bzip2: File exists` when container is restarted.
+
+## [4.2.1-1] - 14/05/2018
+### Added
 * Add and configure circus, an alternative to supervisor, compatible with Python 3, with better control over environment variables propagation, and network sockets supervision (not used yet here)
 * Mandatory perl modules for Backuppc are now installed as pre-compiled binaries from Alpine repos
 
diff --git a/README.md b/README.md
index 8d2a710..e198a4a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 #  ![](https://raw.githubusercontent.com/adferrand/docker-backuppc/master/images/logo_200px.png) adferrand/backuppc
-![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.2.1-1.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.2.1-1.svg)](https://microbadger.com/images/adferrand/backuppc:4.2.1-1) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master)
+![](https://img.shields.io/badge/tags-4%20latest-lightgrey.svg) [![](https://images.microbadger.com/badges/version/adferrand/backuppc:4.2.1-2.svg) ![](https://images.microbadger.com/badges/image/adferrand/backuppc:4.2.1-2.svg)](https://microbadger.com/images/adferrand/backuppc:4.2.1-2) [![CircleCI](https://circleci.com/gh/adferrand/docker-backuppc/tree/master.svg?style=shield)](https://circleci.com/gh/adferrand/docker-backuppc/tree/master)
 
 * [Container functionalities](#container-functionalities)
 * [About BackupPC](#about-backuppc)
diff --git a/VERSION b/VERSION
index d3ba7a2..8c75c4e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.2.1-1
+4.2.1-2
diff --git a/files/entrypoint.sh b/files/entrypoint.sh
index 1e2b026..dc114c1 100755
--- a/files/entrypoint.sh
+++ b/files/entrypoint.sh
@@ -10,6 +10,9 @@ if [ -f /firstrun ]; then
 	echo 'First run of the container. BackupPC will be installed.'
 	echo 'If exist, configuration and data will be reused and upgraded as needed.'
 
+	# Executable bzip2 seems to have been moved into /usr/bin in latest Alpine version. Fix that.
+	ln -s /usr/bin/bzip2 /bin/bzip2
+
 	# Configure timezone if needed
 	if [ -n "$TZ" ]; then
 		cp /usr/share/zoneinfo/$TZ /etc/localtime 
@@ -99,9 +102,6 @@ export BACKUPPC_GUID
 export BACKUPPC_USERNAME
 export BACKUPPC_GROUPNAME
 
-# Executable bzip2 seems to have been moved into /usr/bin in latest Alpine version. Fix that.
-ln -s /usr/bin/bzip2 /bin/bzip2
-
 # Exec given CMD in Dockerfile
 cd /home/backuppc
 exec "$@"