diff --git a/Mkfiles/dj/config.h b/Mkfiles/dj/config.h
index c5f7a8e3..dfc7ddda 100644
--- a/Mkfiles/dj/config.h
+++ b/Mkfiles/dj/config.h
@@ -120,7 +120,7 @@
 #define PACKAGE_BUGREPORT "bug-yasm@tortall.net"
 
 /* Define to build version of this package. */
-#define PACKAGE_BUILD "BRANCH"
+#define PACKAGE_BUILD "1880"
 
 /* Define to internal version of this package. */
 #define PACKAGE_INTVER "0.6.1"
@@ -129,13 +129,13 @@
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 0.6.x"
+#define PACKAGE_STRING "yasm 0.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.6.x"
+#define PACKAGE_VERSION "0.6.1"
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -159,7 +159,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.6.x"
+#define VERSION "0.6.1"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */
diff --git a/Mkfiles/vc/config.h b/Mkfiles/vc/config.h
index ec7329ac..f1c55405 100644
--- a/Mkfiles/vc/config.h
+++ b/Mkfiles/vc/config.h
@@ -130,13 +130,13 @@
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 0.6.x"
+#define PACKAGE_STRING "yasm 0.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.6.x"
+#define PACKAGE_VERSION "0.6.1"
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -160,7 +160,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.6.x"
+#define VERSION "0.6.1"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */
diff --git a/Mkfiles/vc8/config.h b/Mkfiles/vc8/config.h
index f8483f71..75c731de 100644
--- a/Mkfiles/vc8/config.h
+++ b/Mkfiles/vc8/config.h
@@ -130,13 +130,13 @@
 #define PACKAGE_NAME "yasm"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "yasm 0.6.x"
+#define PACKAGE_STRING "yasm 0.6.1"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "yasm"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "0.6.x"
+#define PACKAGE_VERSION "0.6.1"
 
 /* Define if the C compiler supports function prototypes. */
 #define PROTOTYPES 1
@@ -160,7 +160,7 @@
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "0.6.x"
+#define VERSION "0.6.1"
 
 /* Define if using the dmalloc debugging malloc package */
 /* #undef WITH_DMALLOC */
diff --git a/configure.ac b/configure.ac
index 324746ab..a6616c8f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,17 +5,17 @@
 # autoconf setup
 #
 AC_PREREQ(2.53)
-AC_INIT([yasm], [0.6.x], [bug-yasm@tortall.net])
+AC_INIT([yasm], [0.6.1], [bug-yasm@tortall.net])
 #AC_CONFIG_SRCDIR([src/main.c])
 AC_CONFIG_AUX_DIR(config)
 AM_CONFIG_HEADER([config.h])
 
-AM_INIT_AUTOMAKE(yasm, [0.6.x])
+AM_INIT_AUTOMAKE(yasm, [0.6.1])
 AM_MAINTAINER_MODE
 
 AC_DEFINE(PACKAGE_INTVER, ["0.6.1"],
 	  [Define to internal version of this package.])
-AC_DEFINE(PACKAGE_BUILD, ["BRANCH"], [Define to build version of this package.])
+AC_DEFINE(PACKAGE_BUILD, ["1880"], [Define to build version of this package.])
 
 #
 # autoconf command-line options