diff --git a/debian/autobake-deb.sh b/debian/autobake-deb.sh
index 3ee877a..d0a5c9f 100755
--- a/debian/autobake-deb.sh
+++ b/debian/autobake-deb.sh
@@ -15,7 +15,7 @@ set -e
 # Buildbot, running the test suite from installed .debs on a clean VM.
 export DEB_BUILD_OPTIONS="nocheck"
 
-#export MARIADB_OPTIONAL_DEBS="tokudb-engine"
+export MARIADB_OPTIONAL_DEBS="tokudb-engine"
 
 # Find major.minor version.
 #
@@ -24,8 +24,8 @@ UPSTREAM="${MYSQL_VERSION_MAJOR}.${MYSQL_VERSION_MINOR}.${MYSQL_VERSION_PATCH}${
 RELEASE_EXTRA=""
 
 RELEASE_NAME=""
-PATCHLEVEL="+maria"
-LOGSTRING="MariaDB build"
+PATCHLEVEL="+with-debug-symbols"
+LOGSTRING="MariaDB build and debugging symbols"
 
 # Look up distro-version specific stuff.
 #
@@ -70,7 +70,7 @@ done;
 #
 echo "Incrementing changelog and starting build scripts"
 
-dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME}" "Automatic build with ${LOGSTRING}."
+dch -b -D ${CODENAME} -v "${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}2~${CODENAME}" "Automatic build with ${LOGSTRING}."
 
 echo "Creating package version ${UPSTREAM}${PATCHLEVEL}-${RELEASE_NAME}${RELEASE_EXTRA:+-${RELEASE_EXTRA}}1~${CODENAME} ... "
 
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 2122a3c..0339555 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -15,7 +15,7 @@ DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEBVERSION = $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed 's/^.*-//' )
 
-DEB_SOURCE_PACKAGE ?= $(strip $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':'))
+DEB_SOURCE_PACKAGE ?= $(shell egrep '^Source: ' debian/control | cut -f 2 -d ':')
 DEB_VERSION ?= $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
 DEB_NOEPOCH_VERSION ?= $(shell echo $(DEB_VERSION) | cut -d: -f2-)
 DEB_UPSTREAM_VERSION ?= $(shell echo $(DEB_NOEPOCH_VERSION) | sed 's/-[^-]*$$//')
@@ -250,7 +250,7 @@ binary-arch: build install
 	dh_installinfo -a
 	dh_installlogcheck -a
 	dh_installchangelogs -a
-	dh_strip -a
+	#dh_strip -a
 	dh_link -a	# .so muss nach .so.1.2.3 installier werden!
 	dh_compress -a --exclude=INFO_BIN
 	dh_fixperms -a