diff --git a/dev/merge.sh b/dev/merge.sh
index d9f5497..3476eb5 100755
--- a/dev/merge.sh
+++ b/dev/merge.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-## MERGE 2017040901
+## MERGE 2017061801
 
 ## Merges ofunctions.sh and n_program.sh into program.sh
 ## Adds installer
 
 function __PREPROCESSOR_Merge {
-	PROGRAM=osync
+	local PROGRAM="$1"
 
 	VERSION=$(grep "PROGRAM_VERSION=" n_$PROGRAM.sh)
 	VERSION=${VERSION#*=}
@@ -24,8 +24,7 @@ function __PREPROCESSOR_Merge {
 		__PREPROCESSOR_MergeSubset "$subset" "${subset//SUBSET/SUBSET END}" "ofunctions.sh" "debug_$PROGRAM.sh"
 	done
 
-	__PREPROCESSOR_CleanDebug
-	__PREPROCESSOR_CopyCommons
+	__PREPROCESSOR_CleanDebug "$PROGRAM"
 	rm -f tmp_$PROGRAM.sh
 	if [ $? != 0 ]; then
 		QuickLogger "Cannot remove tmp_$PROGRAM.sh"
@@ -104,6 +103,8 @@ function __PREPROCESSOR_MergeSubset {
 }
 
 function __PREPROCESSOR_CleanDebug {
+	local PROGRAM="$1"
+
 	sed '/'$PARANOIA_DEBUG_BEGIN'/,/'$PARANOIA_DEBUG_END'/d' debug_$PROGRAM.sh | grep -v "$PARANOIA_DEBUG_LINE" > ../$PROGRAM.sh
 	if [ $? != 0 ]; then
 		QuickLogger "Cannot remove PARANOIA_DEBUG code from standard build."
@@ -127,6 +128,8 @@ function __PREPROCESSOR_CleanDebug {
 }
 
 function __PREPROCESSOR_CopyCommons {
+	local PROGRAM="$1"
+
 	sed "s/\[prgname\]/$PROGRAM/g" common_install.sh > ../install.sh
 	if [ $? != 0 ]; then
 		QuickLogger "Cannot assemble install."
@@ -172,5 +175,8 @@ function __PREPROCESSOR_CopyCommons {
 
 # If sourced don't do anything
 if [ "$(basename $0)" == "merge.sh" ]; then
-	__PREPROCESSOR_Merge
+	__PREPROCESSOR_Merge osync
+	__PREPROCESSOR_Merge osync_target_helper
+	__PREPROCESSOR_CopyCommons osync
+
 fi