diff --git a/build-papagayong-linux.sh b/build-papagayong-linux.sh
deleted file mode 100755
index b68f9e5..0000000
--- a/build-papagayong-linux.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-set -e
-
-BASE_DIR=$(cd `dirname "$0"`; pwd)
-DATA_DIR="$BASE_DIR/docker-builder-data"
-BUILD_DIR=$DATA_DIR/build
-PUBLISH_DIR=$BASE_DIR/publish
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-
-run() {
-	local SCRIPT=$1
-	local PLATFORM=$2
-	local PLATFORM_SUFFIX=$3
-
-	echo ""
-	echo "Update papagayong for $PLATFORM_SUFFIX"
-	echo ""
-	
-	$SCRIPT update papagayong-master
-	$SCRIPT clean_before_do install_release papagayong-appimage
-	local DIR="$PACKET_BUILD_DIR/$PLATFORM/papagayong-appimage/install_release"
-	local VERSION_FILE="$PACKET_BUILD_DIR/$PLATFORM/papagayong-appimage/envdeps_release/version-papagayong-master"
-	local VERSION=`cat "$VERSION_FILE" | cut -d'-' -f 1`
-	local COMMIT=`cat "$VERSION_FILE" | cut -d'-' -f 2-`
-	COMMIT="${COMMIT:0:5}"
-	local DATE=`date -u +%Y.%m.%d`
-	if [ -z "$COMMIT" ]; then
-		echo "Cannot find version, pheraps appimage not ready. Cancel."
-		return 1
-	fi
-	if ! ls $PUBLISH_DIR/PapagayoNG-$VERSION-*-$COMMIT-$PLATFORM_SUFFIX.appimage 1> /dev/null 2>&1; then
-		echo "Publish new version $VERSION-$COMMIT-$PLATFORM_SUFFIX"
-		rm -f $PUBLISH_DIR/PapagayoNG-*-$PLATFORM_SUFFIX.appimage
-		cp $DIR/papagayong.appimage $PUBLISH_DIR/PapagayoNG-$VERSION-$DATE-$COMMIT-$PLATFORM_SUFFIX.appimage
-		if [ -f "$PUBLISH_DIR/publish-papagayong.sh" ]; then
-			"$PUBLISH_DIR/publish-papagayong.sh" "$PUBLISH_DIR/PapagayoNG-$VERSION-$DATE-$COMMIT-$PLATFORM_SUFFIX.appimage"
-		fi
-	else
-		echo "Version $VERSION-$COMMIT-$PLATFORM_SUFFIX already published"
-	fi
-}
-
-run "$BASE_DIR/docker/debian-7-64bit/run.sh" "linux-x64" "64bits"
-run "$BASE_DIR/docker/debian-7-32bit/run.sh" "linux-i386" "32bits"
diff --git a/build-papagayong-win.sh b/build-papagayong-win.sh
deleted file mode 100755
index 7c88e6c..0000000
--- a/build-papagayong-win.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export IMAGE=build-fedora-cross-win
-export TASK=papagayong-win
-
-OLDDIR=`pwd`
-BASE_DIR=$(cd `dirname "$0"`; pwd)
-cd "$OLDDIR"
-DATA_DIR="$BASE_DIR/docker-builder-data"
-BUILD_DIR=$DATA_DIR/build
-PUBLISH_DIR=$BASE_DIR/publish
-
-CONFIG_FILE="$BASE_DIR/config.sh"
-PACKET_BUILD_DIR="$BUILD_DIR/packet"
-SCRIPT_BUILD_DIR="$BUILD_DIR/script"
-if [ -f $CONFIG_FILE ]; then
-	source $CONFIG_FILE
-fi
-
-run() {
-	export SCRIPT="$BASE_DIR/docker/run.sh"
-	export PLATFORM=win-${ARCH}
-	export PLATFORM_SUFFIX=${ARCH}bit
-
-	echo ""
-	echo "Update papagayo-ng for ${PLATFORM}"
-	echo ""
-	
-	$SCRIPT /build/script/common/manager.sh update papagayong-master
-	$SCRIPT /build/script/common/manager.sh unpack papagayong-master
-	
-	# QUICK HACK:
-	$SCRIPT /build/script/packet/papagayong-master.files/build-win.sh \
-	        /build/packet/${PLATFORM}/papagayong-master
-	
-	local DIR="$PACKET_BUILD_DIR/$PLATFORM/papagayong-master/build"
-	local FILE=`cd $DIR && ls -1 *.exe | head -n 1`
-	local VERSION_FILE="$PACKET_BUILD_DIR/$PLATFORM/papagayong-master/unpack/version-papagayong-master"
-	local VERSION=`echo "$FILE" | cut -d'-' -f 3`
-	local COMMIT=`cat "$VERSION_FILE" | cut -d'-' -f 2-`
-	COMMIT="${COMMIT:0:5}"
-	local DATE=`date -u +%Y.%m.%d`
-	if [ -z "$COMMIT" ]; then
-		echo "Cannot find version, pheraps appimage not ready. Cancel."
-		return 1
-	fi
-	if ! ls $PUBLISH_DIR/PapagayoNG-$VERSION-*-$COMMIT-win-installer.exe 1> /dev/null 2>&1; then
-		echo "Publish new version $VERSION-$COMMIT-$PLATFORM"
-		rm -f $PUBLISH_DIR/PapagayoNG-*-win-installer.exe
-		cp "$DIR/$FILE" "$PUBLISH_DIR/PapagayoNG-$VERSION-$DATE-$COMMIT-win-installer.exe"
-		if [ -f "$PUBLISH_DIR/publish-papagayong.sh" ]; then
-			"$PUBLISH_DIR/publish-papagayong.sh" "$PUBLISH_DIR/PapagayoNG-$VERSION-$DATE-$COMMIT-win-installer.exe"
-		fi
-	else
-		echo "Version $VERSION-$COMMIT-$PLATFORM_SUFFIX already published"
-	fi
-}
-
-export ARCH=32
-run
diff --git a/build-papagayong.sh b/build-papagayong.sh
new file mode 100755
index 0000000..888144d
--- /dev/null
+++ b/build-papagayong.sh
@@ -0,0 +1,59 @@
+#!/bin/bash
+
+set -e
+
+BASE_DIR=$(cd `dirname "$0"`; pwd)
+DATA_DIR="$BASE_DIR/docker-builder-data"
+BUILD_DIR=$DATA_DIR/build
+PUBLISH_DIR=$BASE_DIR/publish
+CONFIG_FILE="$BASE_DIR/config.sh"
+PACKET_BUILD_DIR="$BUILD_DIR/packet"
+SCRIPT_BUILD_DIR="$BUILD_DIR/script"
+if [ -f $CONFIG_FILE ]; then
+	source $CONFIG_FILE
+fi
+
+SCRIPT="$BASE_DIR/docker/run.sh"
+
+run_appimage() {
+    export PLATFORM="$1"
+    export ARCH="$2"
+
+    echo ""
+    echo "Update papagayong for $PLATFORM-$ARCH"
+    echo ""
+    $SCRIPT update papagayong-master
+    $SCRIPT clean_before_do install_release papagayong-appimage
+
+    "$PUBLISH_DIR/publish.sh" \
+        "papagayong" \
+        "PapagayoNG-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.appimage" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-appimage/install_release" \
+        "*.appimage" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-appimage/envdeps_release/version-papagayong-master"
+}
+
+run_nsis() {
+    export PLATFORM="$1"
+    export ARCH="$2"
+
+    echo ""
+    echo "Update papagayong for $PLATFORM-$ARCH"
+    echo ""
+    #$SCRIPT update papagayong-master
+    #$SCRIPT clean_before_do unpack papagayong-master
+
+    # QUICK HACK:
+    $SCRIPT shell papagayong-master "/build/script/packet/papagayong-master.files/build-win.sh"
+
+    "$PUBLISH_DIR/publish.sh" \
+        "papagayong" \
+        "PapagayoNG-%VERSION%-%DATE%-%COMMIT%-$PLATFORM-${ARCH}bits.exe" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-master/build" \
+        "*.exe" \
+        "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/papagayong-master/unpack/version-papagayong-master"
+}
+
+#run_appimage linux 64
+#run_appimage linux 32
+run_nsis win 32
diff --git a/docker-builder-data/build/script/packet/doxygen-1.8.8.sh b/docker-builder-data/build/script/packet/doxygen-1.8.8.sh
index 47cbf76..1500c69 100644
--- a/docker-builder-data/build/script/packet/doxygen-1.8.8.sh
+++ b/docker-builder-data/build/script/packet/doxygen-1.8.8.sh
@@ -4,6 +4,6 @@ PK_DIRNAME="doxygen-1.8.8"
 PK_ARCHIVE="$PK_DIRNAME.src.tar.gz"
 PK_URL="http://ftp.stack.nl/pub/users/dimitri/$PK_ARCHIVE"
 
-PK_CONFIGURE_OPTIONS_DEFAULT="--host=$HOST --prefix $INSTALL_PACKET_DIR"
+PK_CONFIGURE_OPTIONS_DEFAULT="--prefix $INSTALL_PACKET_DIR"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
diff --git a/docker-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh b/docker-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh
index 5775f87..afb9ec8 100644
--- a/docker-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh
+++ b/docker-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh
@@ -3,6 +3,6 @@ DEPS="gstreamer-0.10.36"
 PK_DIRNAME="gst-plugins-base-0.10.36"
 PK_ARCHIVE="$PK_DIRNAME.tar.gz"
 PK_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$PK_ARCHIVE"
-PK_LICENSE_FILES="AUTHORS COPYING COPYING.LIB CONTRIBUTORS"
+PK_LICENSE_FILES="AUTHORS COPYING COPYING.LIB"
 
 source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh
diff --git a/docker-builder-data/build/script/packet/papagayong-master.files/build-win.sh b/docker-builder-data/build/script/packet/papagayong-master.files/build-win.sh
index c505cdf..4f13439 100755
--- a/docker-builder-data/build/script/packet/papagayong-master.files/build-win.sh
+++ b/docker-builder-data/build/script/packet/papagayong-master.files/build-win.sh
@@ -4,39 +4,37 @@
 
 set -e
 
-ROOT_DIR=$1
-FILES_DIR=$(cd `dirname "$0"`; pwd)
-SOURCE_DIR="$ROOT_DIR/unpack/papagayo-ng"
-BUILD_DIR="$ROOT_DIR/build"
+PK_DIRNAME="papagayo-ng"
+
 PREBUILT_URL="https://github.com/morevnaproject/papagayo-ng/releases/download/v1.4.0/papagayo-ng-1.4.0-win.zip"
 PREBUILT_ZIP="papagayo-ng-1.4.0-win.zip"
 PREBUILT_DIR="papagayo-ng-1.4.0-win"
 
-VERSION=$(grep "export VERSION=" "$SOURCE_DIR/util/package-linux.sh" | cut -d\' -f 2)
+VERSION=$(grep "export VERSION=" "$UNPACK_PACKET_DIR/$PK_DIRNAME/util/package-linux.sh" | cut -d\' -f 2)
 TARGET_DIR="papagayo-ng-$VERSION-win"
 
-if [ ! -f "$BUILD_DIR/papagayo-ng-$VERSION-win-installer.exe" ] \
-|| [ "$BUILD_DIR/papagayo-ng-$VERSION-win-installer.exe" -ot "$ROOT_DIR/unpack.done" ]; then
-	mkdir -p "$BUILD_DIR/prebuilt"
+if [ ! -f "$BUILD_PACKET_DIR/papagayo-ng-$VERSION-win-installer.exe" ] \
+|| [ "$BUILD_PACKET_DIR/papagayo-ng-$VERSION-win-installer.exe" -ot "$CURRENT_PACKET_DIR/unpack.done" ]; then
+	mkdir -p "$BUILD_PACKET_DIR/prebuilt"
 	
-	cd "$BUILD_DIR/prebuilt"
+	cd "$BUILD_PACKET_DIR/prebuilt"
 	wget -c "$PREBUILT_URL"
 	rm -rf "$TARGET_DIR"
 	unzip "$PREBUILT_ZIP"
 	
-	cd "$BUILD_DIR"
+	cd "$BUILD_PACKET_DIR"
 	rm -f "$TARGET_DIR.zip"
 	rm -rf "$TARGET_DIR"
 	mv "prebuilt/$PREBUILT_DIR" "$TARGET_DIR"
 	
-	cd "$BUILD_DIR/$TARGET_DIR"
+	cd "$BUILD_PACKET_DIR/$TARGET_DIR"
 	rm -rf papagayo-ng
-	ln -s "$SOURCE_DIR" papagayo-ng
-	cp "$FILES_DIR/papagayo-ng.nsi" .
-	cp "$FILES_DIR/papagayo-ng.bat" .
-		makensis papagayo-ng.nsi
+	ln -s "$UNPACK_PACKET_DIR/$PK_DIRNAME" papagayo-ng
+	cp "$FILES_PACKET_DIR/papagayo-ng.nsi" .
+	cp "$FILES_PACKET_DIR/papagayo-ng.bat" .
+	makensis papagayo-ng.nsi
 	
-	cd "$BUILD_DIR"
+	cd "$BUILD_PACKET_DIR"
 	zip -r "$TARGET_DIR.zip" "$TARGET_DIR"
 	rm -rf "$TARGET_DIR"
 	mv "papagayo-ng-installer.exe" "papagayo-ng-$VERSION-win-installer.exe"