diff --git a/runtime/indent/changelog.vim b/runtime/indent/changelog.vim
new file mode 100644
index 0000000..3aa8e03
--- /dev/null
+++ b/runtime/indent/changelog.vim
@@ -0,0 +1,15 @@
+" Vim indent file
+" Language:	generic Changelog file
+" Language:	C
+" Maintainer:	noone
+" Last Change:	2005 Mar 28
+
+" Only load this indent file when no other was loaded.
+if exists("b:did_indent")
+   finish
+endif
+let b:did_indent = 1
+
+setlocal ai
+
+let b:undo_indent = "setl ai<"
diff --git a/runtime/indent/ishd.vim b/runtime/indent/ishd.vim
index 9b4d7ff..f55f7dc 100644
--- a/runtime/indent/ishd.vim
+++ b/runtime/indent/ishd.vim
@@ -8,11 +8,14 @@
 endif
 let b:did_indent = 1
 
+setlocal autoindent
 setlocal indentexpr=GetIshdIndent(v:lnum)
 setlocal indentkeys&
 setlocal indentkeys+==else,=elseif,=endif,=end,=begin,<:>
 " setlocal indentkeys-=0#
 
+let b:undo_indent = "setl ai< indentexpr< indentkeys<"
+
 " Only define the function once.
 if exists("*GetIshdIndent")
     finish
diff --git a/runtime/indent/java.vim b/runtime/indent/java.vim
index 311d708..facbdbf 100644
--- a/runtime/indent/java.vim
+++ b/runtime/indent/java.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Java
 " Maintainer:	Toby Allsopp <toby.allsopp@peace.com> (resigned)
-" Last Change:	2004 Oct 05
+" Last Change:	2005 Mar 28
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -10,7 +10,7 @@
 let b:did_indent = 1
 
 " Indent Java anonymous classes correctly.
-setlocal cinoptions& cinoptions+=j1
+setlocal cindent cinoptions& cinoptions+=j1
 
 " The "extends" and "implements" lines start off with the wrong indent.
 setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements
@@ -18,6 +18,8 @@
 " Set the function to do the work.
 setlocal indentexpr=GetJavaIndent()
 
+let b:undo_indent = "set cin< cino< indentkeys< indentexpr<"
+
 " Only define the function once.
 if exists("*GetJavaIndent")
   finish