diff --git a/.yardopts b/.yardopts
index 31c7c83bbfd..26bf7a91052 100644
--- a/.yardopts
+++ b/.yardopts
@@ -10,6 +10,7 @@
 --tag dsl:"DSL"
 --no-transitive-tag api
 --template-path yardoc/templates
---query has_tag?(:api)
+--api public
+--api private
 --hide-void-return
 lib/**/*.rb
diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 33b1cef809d..4a73ab520f0 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -289,7 +289,7 @@ def lookupvar(name, options = {})
   # @param options [Hash] Additional options, not part of api.
   # @return [Object] the value assigned to the given varname
   # @see #[]=
-  # @api
+  # @api public
   #
   def [](varname, options={})
     lookupvar(varname, options)
@@ -393,7 +393,7 @@ def setvar(name, value, options = {})
   # @param value [String] The value to assign to the given variable name.
   # @param options [Hash] Additional options, not part of api.
   #
-  # @api
+  # @api public
   #
   def []=(varname, value, options = {})
     setvar(varname, value, options = {})