diff --git a/ChangeLog b/ChangeLog
index 1743f78059..5ae0d46c34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-22  Lars Gullik Bjønnes  <larsbj@lyx.org>
+
+	* src/version.h: set to 1.1.6pre2
+
 2000-11-20  Marko Vendelin <markov@ioc.ee>
 
 	* src/frontends/gnome/Dialogs.C: added signal Dialogs::redrawGUI
diff --git a/src/LyXAction.C b/src/LyXAction.C
index 894becff85..0223d7b3f1 100644
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -453,8 +453,7 @@ LyXAction::LyXAction()
 // if it doesn't exist.
 int LyXAction::searchActionArg(kb_action action, string const & arg) const
 {
-	// BUG we really want to use const_iterator (Lgb)
-	arg_map::iterator pit = lyx_arg_map.find(action);
+	arg_map::const_iterator pit = lyx_arg_map.find(action);
 
 	if (pit == lyx_arg_map.end()) {
 		// the action does not have any pseudoactions
@@ -464,8 +463,7 @@ int LyXAction::searchActionArg(kb_action action, string const & arg) const
 		return LFUN_UNKNOWN_ACTION;
 	}
 
-	// BUG we really want to use const_iterator (Lgb)
-	arg_item::iterator aci = (*pit).second.find(arg);
+	arg_item::const_iterator aci = (*pit).second.find(arg);
 
 	if (aci == (*pit).second.end()) {
 		// the action does not have any pseudoactions with this arg
@@ -521,8 +519,7 @@ kb_action LyXAction::retrieveActionArg(int pseudo, string & arg) const
 {
 	arg.erase(); // clear it to be sure.
 
-	// BUG we really want to use const_iterator (Lgb)
-	pseudo_map::iterator pit = lyx_pseudo_map.find(pseudo);
+	pseudo_map::const_iterator pit = lyx_pseudo_map.find(pseudo);
 
 	if (pit != lyx_pseudo_map.end()) {
 		lyxerr[Debug::ACTION] << "Found the pseudoaction: ["
diff --git a/src/filedlg.C b/src/filedlg.C
index aa2293747d..2240d9db56 100644
--- a/src/filedlg.C
+++ b/src/filedlg.C
@@ -81,8 +81,7 @@ class UserCache {
 public:
 	/// seeks user name from group ID
 	string const & find(uid_t ID) const {
-		// We really want to use const_iterator. (Lgb)
-		Users::iterator cit = users.find(ID);
+		Users::const_iterator cit = users.find(ID);
 		if (cit == users.end()) {
 			add(ID);
 			return users[ID];
@@ -133,8 +132,7 @@ private:
 
 string const & GroupCache::find(gid_t ID) const 
 {
-	// We really want to use const_iterator. (Lgb)
-	Groups::iterator cit = groups.find(ID);
+	Groups::const_iterator cit = groups.find(ID);
 	if (cit == groups.end()) {
 		add(ID);
 		return groups[ID];
diff --git a/src/version.h b/src/version.h
index 836f435277..dfda1f859d 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1,8 +1,8 @@
 /* Version and release date definition */
 ///
-#define LYX_VERSION "1.1.6cvs"
+#define LYX_VERSION "1.1.6pre2"
 ///
-#define LYX_RELEASE "Thu, Oct 26, 2000"
+#define LYX_RELEASE "Wed, Nov 22, 2000"
 /* This version string is intended to be used in files created by LyX */
 ///
 #define LYX_DOCVERSION "LyX 1.1"