diff --git a/configure.ac b/configure.ac
index 7311ef6b..8280899c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1755,7 +1755,7 @@ test "x$ac_cv_use_kdoc" = "xyes" && ac_cv_use_kdoc=`(which kdoc) 2>/dev/null`
 AC_MSG_CHECKING([for kdoc version])
 if [[ "x$ac_cv_use_kdoc" != "x" -a -x "$ac_cv_use_kdoc" ]]; then
 KDOC_BIN="$ac_cv_use_kdoc"
-ac_cv_use_kdoc=`($KDOC_BIN --version) 2>&1 | awk '{ print $2 }'`
+ac_cv_use_kdoc=`($KDOC_BIN --version) 2>&1 | awk '/^kdoc/ { print $2 }'`
 else
 ac_cv_use_kdoc="no"
 fi
diff --git a/packing/rpm/yate.spec.in b/packing/rpm/yate.spec.in
index 1e74552d..23a1a715 100644
--- a/packing/rpm/yate.spec.in
+++ b/packing/rpm/yate.spec.in
@@ -16,7 +16,11 @@
 %{!?systemd:%define systemd %(test -x /usr/bin/systemd && echo 1 || echo 0)}
 %{!?_unitdir:%define _unitdir /usr/lib/systemd/system}
 %{!?dist:%define dist %{nil}}
+%if "@PACKAGE_STATUS@" == ""
+%{!?status:%define status %{nil}}
+%else
 %{!?status:%define status @PACKAGE_STATUS@}
+%endif
 %{!?revision:%define revision %{nil}}
 %{?nodeps:%define no_auto_deps 1}
 %{?nopstn:%define no_pstn 1}
diff --git a/windows/yateversn.h b/windows/yateversn.h
index e81f71fa..0c17467e 100644
--- a/windows/yateversn.h
+++ b/windows/yateversn.h
@@ -35,7 +35,7 @@
 #define YATE_VERSION "6.0.0"
 #define YATE_RELEASE "1"
 #define YATE_STATUS  ""
-#define YATE_REVISION "6257"
+#define YATE_REVISION "6258"
 
 /* Windows version resource - file and string style */
 #define YATE_WINVER_F 6,0,0,1