diff --git a/latest/bootstrap.sh b/latest/bootstrap.sh
index c834229..7db7339 100755
--- a/latest/bootstrap.sh
+++ b/latest/bootstrap.sh
@@ -5,48 +5,59 @@ PACKAGE_RELEASE=4
 REV_FILE=./revision.m4
 REV=`date +%y%m%d%H%M`
 
-if test -d .svn ; then
+if test -d ".svn" ; then
+
 	SVN=`which svn 2> /dev/null`
-else
-	SVN=""
-fi
 
-if ! test -x "$SVN" ; then
+	if test -x "$SVN" ; then
 
-	echo "Updating sources..."
-	"$SVN" update
-	if [ "$?" != "0" ]; then
-	
-		echo "$SVN update failed!"
+		echo "Updating sources..."
+		"$SVN" update
+		if [ "$?" != "0" ]; then
 
-	else
+			echo "$SVN update failed!"
 
-		if $SVN --xml info >/dev/null 2>&1; then
-			REV=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
-			LCD=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*<date>\([0-9\-]*\)\T\([0-9\:]*\)\..*<\/date>.*<\/commit>.*/\1 \2/'`
-		elif $SVN --version --quiet >/dev/null 2>&1; then
-			REV=`$SVN info | grep "^Revision:" | cut -d" " -f2`
-			LCD=`$SVN info | grep "^Last Changed Date:" | cut -d" " -f4,5`
 		else
-			LCD=""
-		fi
 
-		echo "m4_define([SVN_REV], $REV)" > $REV_FILE
-		echo "m4_define([SVN_DATE], $LCD)" >> $REV_FILE
-		echo "m4_define([SVN_RELEASE], $PACKAGE_RELEASE)" >> $REV_FILE
+			if $SVN --xml info >/dev/null 2>&1; then
+				REV=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*revision="\([0-9]*\)".*<\/commit>.*/\1/'`
+				LCD=`$SVN --xml info | tr -d '\r\n' | sed -e 's/.*<commit.*<date>\([0-9\-]*\)\T\([0-9\:]*\)\..*<\/date>.*<\/commit>.*/\1 \2/'`
+			elif $SVN --version --quiet >/dev/null 2>&1; then
+				REV=`$SVN info | grep "^Revision:" | cut -d" " -f2`
+				LCD=`$SVN info | grep "^Last Changed Date:" | cut -d" " -f4,5`
+			else
+				LCD=""
+			fi
 
-	fi
+			if [ -z $LCD ]; then
+				LCD=`date +%Y%m%d`
+			fi
+
+			echo "m4_define([SVN_REV], $REV)" > $REV_FILE
+			echo "m4_define([SVN_DATE], $LCD)" >> $REV_FILE
+			echo "m4_define([SVN_RELEASE], $PACKAGE_RELEASE)" >> $REV_FILE
 
-	SVN2CL=`which svn2cl.sh 2> /dev/null`
-	if [ ! -z $SVN2CL ]; then
-		echo "Creating changelog ..."
-		$SVN2CL
+		fi
+
+		SVN2CL=`which svn2cl.sh 2> /dev/null`
+		if [ ! -z $SVN2CL ]; then
+			echo "Creating changelog ..."
+			$SVN2CL
+		fi
 	fi
 
+elif [ ! -e $REV_FILE ]; then
+	echo "Can´t find subversion and no revision.m4 supplied; aborting"
+	exit -1
+fi
+
+if [ ! -f $REV_FILE ]; then
+	echo "Can't create $REV_FILE Is svn installed?"
+	exit -1
 fi
 
 case $MACHTYPE in
-	
+
 *-apple-*)
 
 	if [ -z $JHBUILD_PREFIX ]; then
@@ -55,7 +66,7 @@ case $MACHTYPE in
 	fi
 
 	;;
-	
+
 *)
 	SVN_SCRIPT="s/@PACKAGE_VERSION@/$PACKAGE_VERSION/g;s/@PACKAGE_RELEASE@/$PACKAGE_RELEASE/g;s/@PACKAGE_REVISION@/$REV/g;s/@DATE_CHANGED@/`date --rfc-2822`/g"
 
@@ -67,7 +78,7 @@ case $MACHTYPE in
 		sed "$SVN_SCRIPT" "debian/changelog.in" > "debian/changelog"
 	fi
 	;;
-		
+
 esac
 
 aclocal
@@ -80,11 +91,6 @@ if [ "$?" != "0" ]; then
 	exit -1
 fi
 
-if [ ! -f $REV_FILE ]; then
-	echo "Can't create $REV_FILE Is svn installed?"
-	exit -1
-fi
-
 echo "pw3270 $PACKAGE_VERSION-$PACKAGE_RELEASE Ok"
 
 
diff --git a/latest/pw3270.cbp b/latest/pw3270.cbp
index 6bb270f..85e290f 100644
--- a/latest/pw3270.cbp
+++ b/latest/pw3270.cbp
@@ -35,6 +35,7 @@
 			<Add option="-Wall" />
 		</Compiler>
 		<Unit filename="Makefile.in" />
+		<Unit filename="bootstrap.sh" />
 		<Unit filename="configure.ac" />
 		<Unit filename="debian\control.in">
 			<Option target="Release" />
diff --git a/latest/src/lib/Makefile.in b/latest/src/lib/Makefile.in
index a17fc3f..c464f5f 100644
--- a/latest/src/lib/Makefile.in
+++ b/latest/src/lib/Makefile.in
@@ -61,7 +61,8 @@ SSL_CFLAGS=@SSL_CFLAGS@
 SSL_LIBS=@SSL_LIBS@
 
 SOCKET_LIBS=@SOCKET_LIBS@
-SDK_LDFLAGS="-Wl,--warn-duplicate-exports,--output-def,$(basename $(@F)).def"
+SDK_LDFLAGS="--output-def,$(basename $(@F)).def"
+# -Wl,--warn-duplicate-exports,
 
 #---[ Sources ]----------------------------------------------------------------
 
--
libgit2 0.21.2