diff --git a/.gitignore b/.gitignore
index a6509c69d76..208b03861e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -199,7 +199,6 @@ vgcore*
 *.changes
 build-stamp
 configure-stamp
-debian/changelog
 debian/*.debhelper.log
 debian/*.debhelper
 debian/*.substvars
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 00000000000..15bf503f468
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+clickhouse (1.1.54275) unstable; urgency=low
+
+  * Modified source code
+
+ -- proller <proller@yandex-team.ru>  Thu, 17 Aug 2017 19:33:34 +0300
diff --git a/release b/release
index d85357fc185..106f118ad74 100755
--- a/release
+++ b/release
@@ -10,9 +10,12 @@ source "./release_lib.sh"
 CONTROL=debian/control
 CHLOG=debian/changelog
 CHDATE=$(LC_ALL=C date -R | sed -e 's/,/\\,/g') # Replace comma to '\,'
-
 DEBUILD_NOSIGN_OPTIONS="-us -uc"
 
+if [ -z "$REVISION" ] ; then
+    get_revision_author
+fi
+
 while [[ $1 == --* ]]
 do
     if [[ $1 == '--test' ]]; then
@@ -35,9 +38,6 @@ do
     fi
 done
 
-if [ -z "$REVISION" ] ; then
-    get_revision_author
-fi
 
 # Build options
 if [ -n "$SANITIZER" ]
diff --git a/release_lib.sh b/release_lib.sh
index abc392d9e1c..52e474cda65 100644
--- a/release_lib.sh
+++ b/release_lib.sh
@@ -25,7 +25,7 @@ function gen_revision_author {
         while [ $succeeded -eq 0 ] && [ $attempts -le $max_attempts ]; do
             attempts=$(($attempts + 1))
             REVISION=$(($REVISION + 1))
-            git_tag_grep=`git tag | grep "$VERSION_PREFIX$REVISION$VERSION_POSTFIX"`
+            ( git_tag_grep=`git tag | grep "$VERSION_PREFIX$REVISION$VERSION_POSTFIX"` ) || true
             if [ "$git_tag_grep" == "" ]; then
                 succeeded=1
             fi
@@ -36,17 +36,19 @@ function gen_revision_author {
         fi
 
         auto_message="Auto version update to"
-        git_log_grep=`git log --oneline --max-count=1 | grep "$auto_message"`
+        ( git_log_grep=`git log --oneline --max-count=1 | grep "$auto_message"` ) || true
         if [ "$git_log_grep" == "" ]; then
             tag="$VERSION_PREFIX$REVISION$VERSION_POSTFIX"
 
             # First tag for correct git describe
             echo -e "\nTrying to create tag: $tag"
-            git tag -a "$tag" -m "$tag"
+            git tag -a "$tag" -m "$tag" || true
 
             git_describe=`git describe`
             sed -i -- "s/VERSION_REVISION .*)/VERSION_REVISION $REVISION)/g;s/VERSION_DESCRIBE .*)/VERSION_DESCRIBE $git_describe)/g" dbms/cmake/version.cmake
-            git commit -m "$auto_message [$REVISION]" dbms/cmake/version.cmake
+
+            gen_changelog "$REVISION" "$CHDATE" "$AUTHOR" "$CHLOG"
+            git commit -m "$auto_message [$REVISION]" dbms/cmake/version.cmake debian/changelog
             #git push
 
             # Second tag for correct version information in version.cmake inside tag