diff --git a/vim/dot_vim/after/indent/java.vim b/vim/dot_vim/after/indent/java.vim
new file mode 100644
index 0000000..0ec6c6b
--- /dev/null
+++ b/vim/dot_vim/after/indent/java.vim
@@ -0,0 +1,11 @@
+function! GetJavaIndent_improved()
+    let theIndent = GetJavaIndent()
+    let lnum = prevnonblank(v:lnum - 1)
+    let line = getline(lnum)
+    if line =~ '^\s*@.*$'
+        let theIndent = indent(lnum)
+    endif
+
+    return theIndent
+endfunction
+setlocal indentexpr=GetJavaIndent_improved()