diff --git a/configure.ac b/configure.ac
index 5f2e7fd86..c55dec8be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_REVISION($Revision$)
 AC_PREREQ(2.62)
 test -z "$CFLAGS" && CFLAGS="-g"
-AC_INIT([Heimdal],[1.6.99],[heimdal-bugs@h5l.org])
+AC_INIT([Heimdal],[6.99.1],[heimdal-bugs@h5l.org])
 AC_CONFIG_SRCDIR([kuser/kinit.c])
 AC_CONFIG_HEADERS(include/config.h)
 AC_CONFIG_MACRO_DIR([cf])
diff --git a/windows/NTMakefile.version b/windows/NTMakefile.version
index 5c901d239..46964e226 100644
--- a/windows/NTMakefile.version
+++ b/windows/NTMakefile.version
@@ -6,9 +6,9 @@ VER_PACKAGE_BUGREPORT=heimdal-bugs@h5l.org
 VER_PACKAGE_COPYRIGHT=Copyright (C) 1995-2013 Royal Institute of Technology, Stockholm, Sweden
 VER_PACKAGE_COMPANY=www.h5l.org
 
-VER_PRODUCT_MAJOR=1
-VER_PRODUCT_MINOR=6
-VER_PRODUCT_AUX=9900
+VER_PRODUCT_MAJOR=6
+VER_PRODUCT_MINOR=99
+VER_PRODUCT_AUX=1
 VER_PRODUCT_PATCH=0
 
 # ------------------------------------------------------------