diff --git a/CHANGELOG b/CHANGELOG
index c2085e7e..9b3b0e05 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.6 ===
+* Updated build scripts.
+
 === 1.0.5 ===
 * Implemented dsp::prgba32_set_alpha and dsp::pbgra32_set_alpha functions.
 * Better assembly code form 32-bit ARM, now compatible with Clang.
diff --git a/include/lsp-plug.in/dsp/version.h b/include/lsp-plug.in/dsp/version.h
index 8230c932..f2385c71 100644
--- a/include/lsp-plug.in/dsp/version.h
+++ b/include/lsp-plug.in/dsp/version.h
@@ -25,7 +25,7 @@
 // Define version of headers
 #define LSP_DSP_LIB_MAJOR           1
 #define LSP_DSP_LIB_MINOR           0
-#define LSP_DSP_LIB_MICRO           5
+#define LSP_DSP_LIB_MICRO           6
 
 #if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
     #define LSP_DSP_LIB_EXPORT_MODIFIER     __declspec(dllexport)
diff --git a/make/configure.mk b/make/configure.mk
index b7bf7f84..d6a0b38e 100644
--- a/make/configure.mk
+++ b/make/configure.mk
@@ -154,12 +154,8 @@ endef
 
 define binconfig =
   $(eval name=$(1))
-<<<<<<< Updated upstream
-  $(eval $(call _modconfig,$(1),$(1)))
-=======
   $(eval publisher=1)
-  $(eval $(call _modconfig,$(1),))
->>>>>>> Stashed changes
+  $(eval $(call _modconfig,$(name),$(publisher)))
 endef
 
 define hdrconfig =
diff --git a/make/modules.mk b/make/modules.mk
index c7a14823..2beca70d 100644
--- a/make/modules.mk
+++ b/make/modules.mk
@@ -78,8 +78,8 @@ $(ALL_SRC_MODULES) $(ALL_HDR_MODULES):
 	test -f "$($(@)_PATH)/.git/config" || $(GIT) clone "$($(@)_URL)" "$($(@)_PATH)"
 	mkdir -p $(dir $($(@)_PATH))
 	$(GIT) -C "$($(@)_PATH)" reset --hard
-	$(GIT) -C "$($(@)_PATH)" fetch origin --force
-	$(GIT) -C "$($(@)_PATH)" fetch origin '+refs/heads/*:refs/tags/*' --force
+	$(GIT) -C "$($(@)_PATH)" fetch origin --force --prune --prune-tags
+	$(GIT) -C "$($(@)_PATH)" fetch origin 'refs/tags/*:refs/tags/*' --force
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_BRANCH)" "origin/$($(@)_BRANCH)" || \
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout "refs/tags/$($(@)_BRANCH)" || \
 	$(GIT) -c advice.detachedHead=false -C "$($(@)_PATH)" checkout -B "$($(@)_NAME)-$($(@)_BRANCH)" "origin/$($(@)_NAME)-$($(@)_BRANCH)" || \
diff --git a/modules.mk b/modules.mk
index 8bf56c26..32ab8b50 100644
--- a/modules.mk
+++ b/modules.mk
@@ -19,13 +19,13 @@
 #
 
 # Variables that describe dependencies
-LSP_COMMON_LIB_VERSION     := 1.0.21
+LSP_COMMON_LIB_VERSION     := 1.0.22
 LSP_COMMON_LIB_NAME        := lsp-common-lib
 LSP_COMMON_LIB_TYPE        := src
 LSP_COMMON_LIB_URL_RO      := https://github.com/lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 LSP_COMMON_LIB_URL_RW      := git@github.com:lsp-plugins/$(LSP_COMMON_LIB_NAME).git
 
-LSP_TEST_FW_VERSION        := 1.0.15
+LSP_TEST_FW_VERSION        := 1.0.16
 LSP_TEST_FW_NAME           := lsp-test-fw
 LSP_TEST_FW_TYPE           := src
 LSP_TEST_FW_URL_RO         := https://github.com/lsp-plugins/$(LSP_TEST_FW_NAME).git
diff --git a/project.mk b/project.mk
index 40dca1d8..1106025c 100644
--- a/project.mk
+++ b/project.mk
@@ -23,4 +23,4 @@ ARTIFACT_ID                 = LSP_DSP_LIB
 ARTIFACT_NAME               = lsp-dsp-lib
 ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.5
+ARTIFACT_VERSION            = 1.0.6