diff --git a/java/java-psi-api/src/com/intellij/psi/javadoc/JavadocManager.java b/java/java-psi-api/src/com/intellij/psi/javadoc/JavadocManager.java
new file mode 100644
index 000000000000..563878eb6bfc
--- /dev/null
+++ b/java/java-psi-api/src/com/intellij/psi/javadoc/JavadocManager.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2000-2013 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.psi.javadoc;
+
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * @author mike
+ */
+public interface JavadocManager {
+  class SERVICE {
+    private SERVICE() {
+    }
+
+    public static JavadocManager getInstance(Project project) {
+      return ServiceManager.getService(project, JavadocManager.class);
+    }
+  }
+  
+  @NotNull
+  JavadocTagInfo[] getTagInfos(PsiElement context);
+
+  @Nullable
+  JavadocTagInfo getTagInfo(String name);
+}
diff --git a/java/openapi/src/com/intellij/psi/javadoc/JavadocTagInfo.java b/java/java-psi-api/src/com/intellij/psi/javadoc/JavadocTagInfo.java
similarity index 97%
rename from java/openapi/src/com/intellij/psi/javadoc/JavadocTagInfo.java
rename to java/java-psi-api/src/com/intellij/psi/javadoc/JavadocTagInfo.java
index 7435213e577b..d79132857438 100644
--- a/java/openapi/src/com/intellij/psi/javadoc/JavadocTagInfo.java
+++ b/java/java-psi-api/src/com/intellij/psi/javadoc/JavadocTagInfo.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2013 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.