diff --git a/platform/util/resources/misc/registry.properties b/platform/util/resources/misc/registry.properties
index 47d8d1f0ba91..2e19227d6b6c 100644
--- a/platform/util/resources/misc/registry.properties
+++ b/platform/util/resources/misc/registry.properties
@@ -861,10 +861,6 @@ bigger.font.in.project.view.description=Increases font size in Project View
 darcula.use.native.fonts.on.linux=true
 darcula.use.native.fonts.on.linux.description=If false, uses DejaVu Sans 13pt
 
-cvs.roots.refresh.uses.vfs=true
-cvs.roots.refresh.uses.vfs.description=Should CVS roots refresh after update use VFS
-cvs.server.output.max.lines=1000
-cvs.server.output.max.lines.description=The maximum number of lines that are displayed per command in the CVS console
 vcs.add.remove.silent=true
 vcs.ignorefile.generation=false
 vcs.ignorefile.generation.description=If true, native VCS ignored files (e.g. .gitignore) are generated on first project open (import) and after creating a VCS repository from IDEA.
diff --git a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
index 827c9c61604f..68833ba0dde1 100644
--- a/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
+++ b/plugins/cvs/cvs-plugin/src/META-INF/plugin.xml
@@ -20,6 +20,10 @@
   <depends>com.intellij.modules.vcs</depends>
 
   <extensions defaultExtensionNs="com.intellij">
+    <registryKey key="cvs.roots.refresh.uses.vfs" defaultValue="true"
+                 description="Should CVS roots refresh after update use VFS"/>
+    <registryKey key="cvs.server.output.max.lines" defaultValue="1000"
+                 description="The maximum number of lines that are displayed per command in the CVS console"/>
     <checkoutProvider implementation="com.intellij.cvsSupport2.checkout.CvsCheckoutProvider"/>
 
     <applicationService serviceInterface="com.intellij.openapi.cvsIntegration.CvsServices"