diff --git a/debian/changelog b/debian/changelog
index e5ecd460..cf011346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lynis (1.6.3-1) utopic; urgency=low
+
+  * Release 1.6.3
+
+ -- Michael Boelen <michael.boelen@cisofy.com>  Fri, 24 Oct 2014 10:58:23 +0200
+
 lynis (1.6.2-1) utopic; urgency=low
 
   * Release 1.6.2
diff --git a/debian/rules b/debian/rules
index cf69ec6e..4ea656a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-build: build-indep build-arch
+build: build-arch build-indep
 build-indep: build-stamp
 build-arch: build-stamp
 build-stamp:
@@ -36,6 +36,7 @@ install: build
 
 
 # Build architecture-dependent files here.
+binary-arch: build install
 binary-indep: build install
 	dh_testdir
 	dh_testroot
@@ -53,7 +54,6 @@ binary-indep: build install
 	dh_md5sums
 	dh_builddeb
 
-binary-arch: build install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/extras/build-lynis.sh b/extras/build-lynis.sh
index 7d2dd826..437a530a 100755
--- a/extras/build-lynis.sh
+++ b/extras/build-lynis.sh
@@ -232,7 +232,7 @@
       else
         echo "[X] Could not find source file (${SOURCEFILE_RPM})"
         echo "    Hint: cp <lynis.tar.gz> ${SOURCEFILE_RPM}"
-        ExitFatal
+        #ExitFatal
     fi
 
     echo "[*] Starting with DEB building process"
@@ -271,6 +271,14 @@
 #        echo "Output: ${BZRSTATUS}"
 #    fi
 
+    if [ -d ${MYBUILDDIR}/git/Lynis ]; then
+        echo "git clone already exists"
+        rm -rf ${MYBUILDDIR}/git/Lynis
+        #git checkout tags/${LYNIS_VERSION}
+    fi
+    git clone https://github.com/CISOfy/Lynis.git ${MYBUILDDIR}/git/Lynis
+    #git tag -l ${MYBUILDDIR}/git/Lynis
+
     cd ..
     ${GITBUILDPACKAGEBINARY} --git-tarball-dir=${MYBUILDDIR} --git-export-dir=${DEBWORKDIR}
     cd ${MYWORKDIR}