diff --git a/docbook/release-notes.asciidoc b/docbook/release-notes.asciidoc
index aba8659ac4..47bfd8ea7d 100644
--- a/docbook/release-notes.asciidoc
+++ b/docbook/release-notes.asciidoc
@@ -23,9 +23,9 @@ user interface. It will not be supported or available in Wireshark 3.0.
 Many user interface improvements have been made. See the “New and Updated
 Features” section below for more details.
 
-//=== Bug Fixes
+=== Bug Fixes
 
-//The following bugs have been fixed:
+The following bugs have been fixed:
 
 //* ws_buglink:5000[]
 //* ws_buglink:6000[Wireshark bug]
diff --git a/make-version.pl b/make-version.pl
index 26f045b421..2c53467f1e 100755
--- a/make-version.pl
+++ b/make-version.pl
@@ -73,7 +73,7 @@ my $set_release = 0;
 my %version_pref = (
 	"version_major" => 2,
 	"version_minor" => 5,
-	"version_micro" => 1,
+	"version_micro" => 2,
 	"version_build" => 0,
 
 	"enable"        => 1,
@@ -83,12 +83,12 @@ my %version_pref = (
 	"format"        => "git %Y%m%d%H%M%S",
 
 	# Normal development builds
-	#"pkg_enable" => 1,
-	#"pkg_format" => "-%#",
+	"pkg_enable" => 1,
+	"pkg_format" => "-%#",
 
 	# Development releases
-	"pkg_enable" => 0,
-	"pkg_format" => "",
+	#"pkg_enable" => 0,
+	#"pkg_format" => "",
 	);
 my $srcdir = ".";
 my $info_cmd = "";