diff --git a/CMakeLists.txt b/CMakeLists.txt
index 374ba8b..50937bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8...3.10)
 
 set(lib_name quic)
 
diff --git a/cmake/changelog.sh b/cmake/changelog.sh
index 67f995f..087129d 100644
--- a/cmake/changelog.sh
+++ b/cmake/changelog.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 work_path=$1
-branch=`git status | grep branch | awk '{print $NF}'`
+branch=`git status | grep 'On branch' | awk '{print $NF}'`
 git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B"  | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/  -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > $work_path/changelog.txt
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a264398..fe765b6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8)
+cmake_minimum_required (VERSION 2.8...3.10)
 
 set(lib_name quic)
 project(${lib_name}_test)