diff --git a/src/Compat.jl b/src/Compat.jl
index 971af68ea..e31d15934 100644
--- a/src/Compat.jl
+++ b/src/Compat.jl
@@ -1502,19 +1502,19 @@ end
         using Base: @code_llvm, @code_lowered, @code_native, @code_typed,
                     @code_warntype, @edit, @functionloc, @less, @which,
                     apropos, code_llvm, code_native, code_warntype, edit,
-                    less, methodswith, subtypes, varinfo, versioninfo, whos
+                    less, methodswith, subtypes, versioninfo
         export @code_llvm, @code_lowered, @code_native, @code_typed,
                @code_warntype, @edit, @functionloc, @less, @which,
                apropos, code_llvm, code_native, code_warntype, edit,
-               less, methodswith, subtypes, varinfo, versioninfo, whos
-
-        Base.@deprecate whos(io::IO, m::Module, pat::Regex) show(io, varinfo(m, pat))
-        Base.@deprecate whos(io::IO, m::Module)             show(io, varinfo(m))
-        Base.@deprecate whos(io::IO)                        show(io, varinfo())
-        Base.@deprecate whos(m::Module, pat::Regex)         varinfo(m, pat)
-        Base.@deprecate whos(m::Module)                     varinfo(m)
-        Base.@deprecate whos(pat::Regex)                    varinfo(pat)
-        Base.@deprecate whos()                              varinfo()
+               less, methodswith, subtypes, versioninfo
+
+        @static if VERSION >= v"0.7.0-DEV.2582"
+            using Base: varinfo
+            export varinfo
+        else
+            const varinfo = whos
+            export varinfo
+        end
     end
 else
     import InteractiveUtils